]> git.eshelyaron.com Git - emacs.git/commitdiff
C++ Mode: Correct the fontification of const auto foo
authorAlan Mackenzie <acm@muc.de>
Thu, 3 Oct 2019 14:26:14 +0000 (14:26 +0000)
committerAlan Mackenzie <acm@muc.de>
Thu, 3 Oct 2019 14:26:14 +0000 (14:26 +0000)
* lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1): Correct a coding
error involving `and' and `or'.

lisp/progmodes/cc-engine.el

index d1cca115f3aceeb6611e73c2b86f98aff54a6874..4ca440fd84b4f9227b27d7e22a874272fec7e9cb 100644 (file)
@@ -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.