[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102006: cc-langs.el (c-type-decl-pre
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102006: cc-langs.el (c-type-decl-prefix-key): C++ bit: move |
Date: |
Tue, 19 Oct 2010 20:45:42 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102006
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-19 20:45:42 +0000
message:
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.
modified:
lisp/ChangeLog
lisp/progmodes/cc-langs.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-10-19 20:18:35 +0000
+++ b/lisp/ChangeLog 2010-10-19 20:45:42 +0000
@@ -1,5 +1,9 @@
2010-10-19 Alan Mackenzie <address@hidden>
+ * 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.
=== modified file 'lisp/progmodes/cc-langs.el'
--- a/lisp/progmodes/cc-langs.el 2010-10-09 19:58:28 +0000
+++ b/lisp/progmodes/cc-langs.el 2010-10-19 20:45:42 +0000
@@ -2676,15 +2676,15 @@
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 "\\(\\*\\)\\([^=]\\|$\\)")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102006: cc-langs.el (c-type-decl-prefix-key): C++ bit: move,
Alan Mackenzie <=