diff options
| author | Alan Mackenzie <acm@muc.de> | 2010-10-19 20:45:42 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2010-10-19 20:45:42 +0000 |
| commit | 7f0789c9db1b26329e22157479d449d29ea50d34 (patch) | |
| tree | f712c2fb768bc80c7ce2bdc4e7d153823d7203ab /lisp/progmodes | |
| parent | ba7fdf303b53766521c86dffb2cafb8d80f91bdb (diff) | |
| download | emacs-7f0789c9db1b26329e22157479d449d29ea50d34.tar.gz emacs-7f0789c9db1b26329e22157479d449d29ea50d34.tar.bz2 emacs-7f0789c9db1b26329e22157479d449d29ea50d34.zip | |
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.
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 6 |
1 files changed, 3 insertions, 3 deletions
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 "\\(\\*\\)\\([^=]\\|$\\)") |