comparison lisp/progmodes/cc-langs.el @ 111053:b5730f66fbf4

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.
author Alan Mackenzie <acm@muc.de>
date Tue, 19 Oct 2010 20:45:42 +0000
parents fb9b207b7488
children 417b1e4d63cd
comparison
equal deleted inserted replaced
111052:09ec9197bd83 111053:b5730f66fbf4
2674 "\\)" 2674 "\\)"
2675 "\\([^=]\\|$\\)") 2675 "\\([^=]\\|$\\)")
2676 c++ (concat "\\(" 2676 c++ (concat "\\("
2677 "[*\(&]" 2677 "[*\(&]"
2678 "\\|" 2678 "\\|"
2679 (concat "\\(" ; 2 2679 (c-lang-const c-type-decl-prefix-key)
2680 "\\|"
2681 (concat "\\(" ; 3
2680 ;; If this matches there's special treatment in 2682 ;; If this matches there's special treatment in
2681 ;; `c-font-lock-declarators' and 2683 ;; `c-font-lock-declarators' and
2682 ;; `c-font-lock-declarations' that check for a 2684 ;; `c-font-lock-declarations' that check for a
2683 ;; complete name followed by ":: *". 2685 ;; complete name followed by ":: *".
2684 (c-lang-const c-identifier-start) 2686 (c-lang-const c-identifier-start)
2685 "\\)") 2687 "\\)")
2686 "\\|"
2687 (c-lang-const c-type-decl-prefix-key)
2688 "\\)" 2688 "\\)"
2689 "\\([^=]\\|$\\)") 2689 "\\([^=]\\|$\\)")
2690 pike "\\(\\*\\)\\([^=]\\|$\\)") 2690 pike "\\(\\*\\)\\([^=]\\|$\\)")
2691 (c-lang-defvar c-type-decl-prefix-key (c-lang-const c-type-decl-prefix-key) 2691 (c-lang-defvar c-type-decl-prefix-key (c-lang-const c-type-decl-prefix-key)
2692 'dont-doc) 2692 'dont-doc)