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 25c2e6e..fc689db 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2280,7 +2280,7 @@
{
/*
* 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 @@
}
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 c78a66e..646fbb3 100644
--- a/src/testdir/test3.in
+++ b/src/testdir/test3.in
Binary files differ
diff --git a/src/testdir/test3.ok b/src/testdir/test3.ok
index cfb519b..035ea39 100644
--- a/src/testdir/test3.ok
+++ b/src/testdir/test3.ok
@@ -2094,3 +2094,9 @@
4
/* end of define */
+
+{
+ a = second/*bug*/*line;
+ x
+}
+
diff --git a/src/version.c b/src/version.c
index 949320c..912808b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1291,
+/**/
1290,
/**/
1289,