diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-01-01 14:43:35 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-01-01 14:43:35 +0000 |
| commit | 78d4abaa9387e8a370394f141ad5c7b2a2b54cc4 (patch) | |
| tree | d81e3297b694f74431d0fdd4dd06f3516a52c23d | |
| parent | ee3f7a51c8a2eadde419971cb5a9e01336752a52 (diff) | |
| download | vim-git-78d4abaa9387e8a370394f141ad5c7b2a2b54cc4.tar.gz | |
updated for version 7.1-178v7.1.178
| -rw-r--r-- | src/search.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c index 58a763114..161117b58 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 e20349dc9..09cbf736b 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, |