summaryrefslogtreecommitdiff
path: root/src/search.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-12 15:36:38 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-12 15:36:38 +0100
commitf8c53d3d268fc67a29c8c1a4e76fae85762e11b5 (patch)
treebff53e0854e8031f9df4866456922991dc236146 /src/search.c
parent80eaddd3a0bc47cb14168964678420cfe03a2502 (diff)
downloadvim-git-f8c53d3d268fc67a29c8c1a4e76fae85762e11b5.tar.gz
patch 8.0.1291: C indent wrong when * immediately follows commentv8.0.1291
Problem: C indent wrong when * immediately follows comment. (John Bowler) Solution: Do not see "/*" after "*" as a comment start. (closes #2321)
Diffstat (limited to 'src/search.c')
-rw-r--r--src/search.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c
index 25c2e6e77..fc689db2d 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2280,7 +2280,7 @@ findmatchlimit(
{
/*
* A comment may contain / * or / /, it may also start or end
- * with / * /. Ignore a / * after / /.
+ * with / * /. Ignore a / * after / / and after *.
*/
if (pos.col == 0)
continue;
@@ -2306,6 +2306,7 @@ findmatchlimit(
}
else if ( linep[pos.col - 1] == '/'
&& linep[pos.col] == '*'
+ && (pos.col == 1 || linep[pos.col - 2] != '*')
&& (int)pos.col < comment_col)
{
count++;