Commit 7f0789c9 authored by Alan Mackenzie's avatar Alan Mackenzie
Browse files

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.
parent ba7fdf30
2010-10-19 Alan Mackenzie <acm@muc.de> 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 * 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 setting of c-new-BEG and c-new-END from c-before-change to
c-after-change. c-after-change.
......
...@@ -2676,15 +2676,15 @@ Identifier syntax is in effect when this is matched \(see ...@@ -2676,15 +2676,15 @@ Identifier syntax is in effect when this is matched \(see
c++ (concat "\\(" c++ (concat "\\("
"[*\(&]" "[*\(&]"
"\\|" "\\|"
(concat "\\(" ; 2 (c-lang-const c-type-decl-prefix-key)
"\\|"
(concat "\\(" ; 3
;; If this matches there's special treatment in ;; If this matches there's special treatment in
;; `c-font-lock-declarators' and ;; `c-font-lock-declarators' and
;; `c-font-lock-declarations' that check for a ;; `c-font-lock-declarations' that check for a
;; complete name followed by ":: *". ;; complete name followed by ":: *".
(c-lang-const c-identifier-start) (c-lang-const c-identifier-start)
"\\)") "\\)")
"\\|"
(c-lang-const c-type-decl-prefix-key)
"\\)" "\\)"
"\\([^=]\\|$\\)") "\\([^=]\\|$\\)")
pike "\\(\\*\\)\\([^=]\\|$\\)") pike "\\(\\*\\)\\([^=]\\|$\\)")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment