From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 12 Nov 2017 14:36:38 +0000 (+0100)
Subject: patch 8.0.1291: C indent wrong when * immediately follows comment
X-Git-Tag: v8.0.1291
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8c53d3d268fc67a29c8c1a4e76fae85762e11b5;p=vim

patch 8.0.1291: C indent wrong when * immediately follows comment

Problem:    C indent wrong when * immediately follows comment. (John Bowler)
Solution:   Do not see "/*" after "*" as a comment start. (closes #2321)
---

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++;
diff --git a/src/testdir/test3.in b/src/testdir/test3.in
index c78a66ec1..646fbb35c 100644
--- a/src/testdir/test3.in
+++ b/src/testdir/test3.in
@@ -2338,6 +2338,16 @@ CCC
 4
 /* end of define */
 
+STARTTEST
+:set cin cino&
+/a = second
+ox
+ENDTEST
+
+{
+	a = second/*bug*/*line;
+}
+
 STARTTEST
 :g/^STARTTEST/.,/^ENDTEST/d
 :1;/start of AUTO/,$wq! test.out
diff --git a/src/testdir/test3.ok b/src/testdir/test3.ok
index cfb519bdf..035ea3999 100644
--- a/src/testdir/test3.ok
+++ b/src/testdir/test3.ok
@@ -2094,3 +2094,9 @@ JSEND
 	4
 /* end of define */
 
+
+{
+	a = second/*bug*/*line;
+	x
+}
+
diff --git a/src/version.c b/src/version.c
index 949320cca..912808b05 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1291,
 /**/
     1290,
 /**/