Mercurial > vim
diff src/search.c @ 12829:91222b3123ba v8.0.1291
patch 8.0.1291: C indent wrong when * immediately follows comment
commit https://github.com/vim/vim/commit/f8c53d3d268fc67a29c8c1a4e76fae85762e11b5
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 12 15:36:38 2017 +0100
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 https://github.com/vim/vim/issues/2321)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 12 Nov 2017 15:45:05 +0100 |
| parents | 7749260f261c |
| children | 3c09e451af3a |
line wrap: on
line diff
--- 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++;