summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2008-01-01 14:43:35 +0000
committervimboss <devnull@localhost>2008-01-01 14:43:35 +0000
commit95d200888834baa4b9c4016afac4c061db881049 (patch)
treed81e3297b694f74431d0fdd4dd06f3516a52c23d
parent2a512e20110afcba2bc6eef0955d086ee60087f1 (diff)
downloadvim-95d200888834baa4b9c4016afac4c061db881049.tar.gz
updated for version 7.1-178v7.1.178v7-1-178
-rw-r--r--src/search.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c
index 58a76311..161117b5 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2319,7 +2319,9 @@ check_linecomment(line)
#endif
while ((p = vim_strchr(p, '/')) != NULL)
{
- if (p[1] == '/')
+ /* accept a double /, unless it's preceded with * and followed by *,
+ * because * / / * is an end and start of a C comment */
+ if (p[1] == '/' && (p == line || p[-1] != '*' || p[2] != '*'))
break;
++p;
}
diff --git a/src/version.c b/src/version.c
index e20349dc..09cbf736 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 178,
+/**/
177,
/**/
176,