0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.3.179

Problem:    C-indent doesn't handle colon in string correctly.
Solution:   Skip the string. (Lech Lorens)
This commit is contained in:
Bram Moolenaar
2011-05-10 11:56:30 +02:00
parent 4ae06c1fa5
commit aede6ceba3
4 changed files with 27 additions and 1 deletions

View File

@@ -5801,7 +5801,9 @@ cin_is_cpp_baseclass(col)
continue; continue;
} }
if (s[0] == ':') if (s[0] == '"')
s = skip_string(s) + 1;
else if (s[0] == ':')
{ {
if (s[1] == ':') if (s[1] == ':')
{ {

View File

@@ -1359,6 +1359,19 @@ void func(void)
if(y==z) if(y==z)
foo=1; foo=1;
else { bar=1; else { bar=1;
baz=2;
}
printf("Foo!\n");
}
STARTTEST
:set cino&
2kdd=][
ENDTEST
void func(void)
{
cout << "a"
<< "b" << "b"
<< ") :" << ") :"
<< "c"; << "c";

View File

@@ -1216,3 +1216,12 @@ void func(void)
printf("Foo!\n"); printf("Foo!\n");
} }
void func(void)
{
cout << "a"
<< "b"
<< ") :"
<< "c";
}

View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
179,
/**/ /**/
178, 178,
/**/ /**/