aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mackenzie2019-10-03 14:26:14 +0000
committerAlan Mackenzie2019-10-03 14:26:14 +0000
commitdacafba03d8cbd6132d84f5c73b61e2ebee6b85a (patch)
treea1321093b5103085e9957b2f36c7d73501b38945
parentcbe3f5f7203b54a7e0ffc65dee83289f1a966077 (diff)
downloademacs-dacafba03d8cbd6132d84f5c73b61e2ebee6b85a.tar.gz
emacs-dacafba03d8cbd6132d84f5c73b61e2ebee6b85a.zip
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'.
-rw-r--r--lisp/progmodes/cc-engine.el12
1 files 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."
9714 9714
9715 (c-forward-syntactic-ws)) 9715 (c-forward-syntactic-ws))
9716 9716
9717 (when (or (and new-style-auto 9717 (when (and (not got-identifier)
9718 (looking-at c-auto-ops-re)) 9718 (or (and new-style-auto
9719 (and (or maybe-typeless backup-maybe-typeless) 9719 (looking-at c-auto-ops-re))
9720 (not got-identifier) 9720 (and (or maybe-typeless backup-maybe-typeless)
9721 (not got-prefix) 9721 (not got-prefix)
9722 at-type)) 9722 at-type)))
9723 ;; Have found no identifier but `c-typeless-decl-kwds' has 9723 ;; Have found no identifier but `c-typeless-decl-kwds' has
9724 ;; matched so we know we're inside a declaration. The 9724 ;; matched so we know we're inside a declaration. The
9725 ;; preceding type must be the identifier instead. 9725 ;; preceding type must be the identifier instead.