cc-langs.el (c-type-decl-prefix-key): C++ bit: move

"\(const\|throw\|volatile\)\>" nearer the start of the regexp, so that
these keywords aren't wrongly matched as identifiers.

2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4aa0ead72b4..58d7841dfd8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-19  Alan Mackenzie  <acm@muc.de>
 
+        * progmodes/cc-langs.el (c-type-decl-prefix-key): C++ bit: move
+        "\(const\|throw\|volatile\)\>" nearer the start of the regexp, so
+        that these keywords aren't wrongly matched as identifiers.
+
         * progmodes/cc-mode.el (c-before-change, c-after-change): Move the
         setting of c-new-BEG and c-new-END from c-before-change to
         c-after-change.
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index ba056133651..ad6b6787652 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -2676,15 +2676,15 @@ Identifier syntax is in effect when this is matched \(see
   c++  (concat "\\("
                "[*\(&]"
                "\\|"
-               (concat "\\("    ; 2
+               (c-lang-const c-type-decl-prefix-key)
+               "\\|"
+               (concat "\\("   ; 3
                        ;; If this matches there's special treatment in
                        ;; `c-font-lock-declarators' and
                        ;; `c-font-lock-declarations' that check for a
                        ;; complete name followed by ":: *".
                        (c-lang-const c-identifier-start)
                        "\\)")
-               "\\|"
-               (c-lang-const c-type-decl-prefix-key)
                "\\)"
                "\\([^=]\\|$\\)")
   pike "\\(\\*\\)\\([^=]\\|$\\)")