[Emacs-diffs] master 56985dd: CC Mode: Fix wrong fontification of FOO in ASSERT (FOO && !BAR)

[Alan Mackenzie]

branch: master
commit 56985dd8a69fc2729422cf8f95efbd03ee6b021e
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>

    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.
---
 lisp/progmodes/cc-engine.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 4916b1d..6d7d322 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)