From dacafba03d8cbd6132d84f5c73b61e2ebee6b85a Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Thu, 3 Oct 2019 14:26:14 +0000 Subject: [PATCH] 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 d1cca115f3a..4ca440fd84b 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. -- 2.39.2