summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2019-09-21 12:35:34 +0000
committerAlan Mackenzie <acm@muc.de>2019-09-21 12:35:34 +0000
commit56985dd8a69fc2729422cf8f95efbd03ee6b021e (patch)
treee232f840e58679e696f22f631f0b7e4045f7196d
parente9724b559ee8548983170155c472aa14792ff2fb (diff)
downloademacs-56985dd8a69fc2729422cf8f95efbd03ee6b021e.tar.gz
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.el3
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."
(throw 'at-decl-or-cast t)))))
;; CASE 18
- (when (and (not (memq context '(nil top)))
+ (when (and at-decl-end
+ (not (memq context '(nil top)))
(or (and got-prefix (not got-number))
(and (eq context 'decl)
(not c-recognize-paren-inits)