diff options
| author | Alan Mackenzie | 2019-09-21 12:35:34 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2019-09-21 12:35:34 +0000 |
| commit | 56985dd8a69fc2729422cf8f95efbd03ee6b021e (patch) | |
| tree | e232f840e58679e696f22f631f0b7e4045f7196d | |
| parent | e9724b559ee8548983170155c472aa14792ff2fb (diff) | |
| download | emacs-56985dd8a69fc2729422cf8f95efbd03ee6b021e.tar.gz emacs-56985dd8a69fc2729422cf8f95efbd03ee6b021e.zip | |
CC Mode: Fix wrong fontification of FOO in ASSERT (FOO && !BAR)
* lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1): Don't recognize the
construct in CASE 18, unless additionally at-decl-end is set.
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 4916b1dabb8..6d7d322def7 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el | |||
| @@ -10100,7 +10100,8 @@ This function might do hidden buffer changes." | |||
| 10100 | (throw 'at-decl-or-cast t))))) | 10100 | (throw 'at-decl-or-cast t))))) |
| 10101 | 10101 | ||
| 10102 | ;; CASE 18 | 10102 | ;; CASE 18 |
| 10103 | (when (and (not (memq context '(nil top))) | 10103 | (when (and at-decl-end |
| 10104 | (not (memq context '(nil top))) | ||
| 10104 | (or (and got-prefix (not got-number)) | 10105 | (or (and got-prefix (not got-number)) |
| 10105 | (and (eq context 'decl) | 10106 | (and (eq context 'decl) |
| 10106 | (not c-recognize-paren-inits) | 10107 | (not c-recognize-paren-inits) |