updated for version 7.3.179

Problem:    C-indent doesn't handle colon in string correctly.
Solution:   Skip the string. (Lech Lorens)

diff --git a/src/misc1.c b/src/misc1.c
index 3a94c3c2bc2371fb22a6316946ec9993aa85ab20..a5c4607e331dd9c0c10e36071a2b2d739d517e78 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -5801,7 +5801,9 @@ cin_is_cpp_baseclass(col)
                continue;
        }
 
-       if (s[0] == ':')
+       if (s[0] == '"')
+           s = skip_string(s) + 1;
+       else if (s[0] == ':')
        {
            if (s[1] == ':')
            {

diff --git a/src/testdir/test3.in b/src/testdir/test3.in
index 8576e275a4d32e10f07888cb06c239fc965827a7..e4c699394fb9280834fff5c7d9d8bbb32285bac4 100644 (file)
--- a/src/testdir/test3.in
+++ b/src/testdir/test3.in
@@ -1359,6 +1359,19 @@ void func(void)
        printf("Foo!\n");
 }
 
+STARTTEST
+:set cino&
+2kdd=][
+ENDTEST
+
+void func(void)
+{
+       cout << "a"
+       << "b"
+       << ") :"
+       << "c";
+}
+
 STARTTEST
 :g/^STARTTEST/.,/^ENDTEST/d
 :1;/start of AUTO/,$wq! test.out

diff --git a/src/testdir/test3.ok b/src/testdir/test3.ok
index 3764453a7b919da36a7473aa6cc0e7859ae98f30..39b485950e57c800ef83556d6889da6ba8bfa631 100644 (file)
--- a/src/testdir/test3.ok
+++ b/src/testdir/test3.ok
@@ -1216,3 +1216,12 @@ void func(void)
        printf("Foo!\n");
 }
 
+
+void func(void)
+{
+       cout << "a"
+               << "b"
+               << ") :"
+               << "c";
+}
+

diff --git a/src/version.c b/src/version.c
index f69bf4e9e1e9bd625838a072952fe16b1101a805..2713ffc43cbb8dba79b796bcc77bfe61d2d854fe 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    179,
 /**/
     178,
 /**/