diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-12 15:36:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-12 15:36:38 +0100 |
| commit | f8c53d3d268fc67a29c8c1a4e76fae85762e11b5 (patch) | |
| tree | bff53e0854e8031f9df4866456922991dc236146 | |
| parent | 80eaddd3a0bc47cb14168964678420cfe03a2502 (diff) | |
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)
| -rw-r--r-- | src/search.c | 3 | ||||
| -rw-r--r-- | src/testdir/test3.in | 10 | ||||
| -rw-r--r-- | src/testdir/test3.ok | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 20 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c index 25c2e6e774..fc689db2df 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 c78a66ec13..646fbb35c3 100644 --- a/src/testdir/test3.in +++ b/src/testdir/test3.in @@ -2339,6 +2339,16 @@ CCC /* 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 ENDTEST diff --git a/src/testdir/test3.ok b/src/testdir/test3.ok index cfb519bdf4..035ea39999 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 949320cca4..912808b050 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1291, +/**/ 1290, /**/ 1289, |