diff options
author | Bram Moolenaar <Bram@vim.org> | 2011-05-10 11:56:30 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2011-05-10 11:56:30 +0200 |
commit | aede6ceba3030db559f503268be9cad75a08ca39 (patch) | |
tree | 766abe7cd9b694aae5d17005e03f421c23c81360 | |
parent | 4ae06c1fa5973496deb74ef06dd116843bf0b647 (diff) |
updated for version 7.3.179v7.3.179
Problem: C-indent doesn't handle colon in string correctly.
Solution: Skip the string. (Lech Lorens)
-rw-r--r-- | src/misc1.c | 4 | ||||
-rw-r--r-- | src/testdir/test3.in | 13 | ||||
-rw-r--r-- | src/testdir/test3.ok | 9 | ||||
-rw-r--r-- | src/version.c | 2 |
4 files changed, 27 insertions, 1 deletions
diff --git a/src/misc1.c b/src/misc1.c index 3a94c3c2bc..a5c4607e33 100644 --- 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 8576e275a4..e4c699394f 100644 --- a/src/testdir/test3.in +++ b/src/testdir/test3.in @@ -1360,6 +1360,19 @@ void func(void) } STARTTEST +:set cino& +2kdd=][ +ENDTEST + +void func(void) +{ + cout << "a" + << "b" + << ") :" + << "c"; +} + +STARTTEST :g/^STARTTEST/.,/^ENDTEST/d :1;/start of AUTO/,$wq! test.out ENDTEST diff --git a/src/testdir/test3.ok b/src/testdir/test3.ok index 3764453a7b..39b485950e 100644 --- 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 f69bf4e9e1..2713ffc43c 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 179, +/**/ 178, /**/ 177, |