[Emacs-diffs] master dacafba: C++ Mode: Correct the fontification of const auto foo

[Alan Mackenzie]

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

    C++ Mode: Correct the fontification of const auto foo
    
    * lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1): Correct a coding
    error involving `and' and `or'.
---
 lisp/progmodes/cc-engine.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index d1cca11..4ca440f 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -9714,12 +9714,12 @@ This function might do hidden buffer changes."
 
        (c-forward-syntactic-ws))
 
-      (when (or (and new-style-auto
-                    (looking-at c-auto-ops-re))
-               (and (or maybe-typeless backup-maybe-typeless)
-                    (not got-identifier)
-                    (not got-prefix)
-                    at-type))
+      (when (and (not got-identifier)
+                (or (and new-style-auto
+                         (looking-at c-auto-ops-re))
+                    (and (or maybe-typeless backup-maybe-typeless)
+                         (not got-prefix)
+                         at-type)))
        ;; Have found no identifier but `c-typeless-decl-kwds' has
        ;; matched so we know we're inside a declaration.  The
        ;; preceding type must be the identifier instead.