diff options
| author | Alan Mackenzie <acm@muc.de> | 2016-04-25 17:57:24 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2016-04-25 17:57:24 +0000 |
| commit | 89d1776b81ab552192ee41f13ce84ff86bda4556 (patch) | |
| tree | 6379dcc27fd3543a5f513794fe920b41beaa6b4f /lisp/progmodes/cc-fonts.el | |
| parent | 86d083438dba60dc00e9e96414bf7e832720c05a (diff) | |
| download | emacs-89d1776b81ab552192ee41f13ce84ff86bda4556.tar.gz emacs-89d1776b81ab552192ee41f13ce84ff86bda4556.tar.bz2 emacs-89d1776b81ab552192ee41f13ce84ff86bda4556.zip | |
Fix spurious fontification of "for (; a * b;)" in CC Mode.
* lisp/progmodes/cc-fonts.el (c-font-lock-declarations): Check for being
inside the parens of a for statement and after a semicolon near the beginning
of the lambda form.
Diffstat (limited to 'lisp/progmodes/cc-fonts.el')
| -rw-r--r-- | lisp/progmodes/cc-fonts.el | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index e171b20f328..6c348514915 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1205,8 +1205,20 @@ casts and declarations are fontified. Used on level 2 and higher." 'font-lock-keyword-face) (looking-at c-not-decl-init-keywords)) (and c-macro-with-semi-re - (looking-at c-macro-with-semi-re))) ; 2008-11-04 - ;; Don't do anything more if we're looking at a keyword that + (looking-at c-macro-with-semi-re)) ; 2008-11-04 + (save-excursion ; A construct after a ; in a `for' statement + ; can't be a declaration. + (and (c-go-up-list-backward) + (eq (char-after) ?\() + (progn (c-backward-syntactic-ws) + (c-simple-skip-symbol-backward)) + (looking-at c-paren-stmt-key) + (progn (goto-char match-pos) + (while (and (eq (char-before) ?\)) + (c-go-list-backward)) + (c-backward-syntactic-ws)) + (eq (char-before) ?\;))))) + ;; Don't do anything more if we're looking at something that ;; can't start a declaration. t |