aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Colascione2011-04-24 17:31:41 -0700
committerDaniel Colascione2011-04-24 17:31:41 -0700
commit05842630f9a2b95a35003ee41aeb10b6df39b1e4 (patch)
tree7f4cb64e5e5ccf807b0a1de3f9c327be383d17dc
parenta3af29290ecf2edc793c4e7c13310985a63ffac0 (diff)
downloademacs-05842630f9a2b95a35003ee41aeb10b6df39b1e4.tar.gz
emacs-05842630f9a2b95a35003ee41aeb10b6df39b1e4.zip
* progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
correct match group (bug#8438).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/cc-engine.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d4c93841e5..0a63e6d5dec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-04-24 Daniel Colascione <dan.colascione@gmail.com>
2
3 * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
4 correct match group (bug#8438).
5
12011-04-24 Chong Yidong <cyd@stupidchicken.com> 62011-04-24 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * emacs-lisp/package.el (package-built-in-p): Fix typo. 8 * emacs-lisp/package.el (package-built-in-p): Fix typo.
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 5ef12300195..0eec54fab6f 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6475,7 +6475,7 @@ comment at the start of cc-engine.el for more info."
6475 ;; `c-font-lock-declarators'.) 6475 ;; `c-font-lock-declarators'.)
6476 (while (and (looking-at c-type-decl-prefix-key) 6476 (while (and (looking-at c-type-decl-prefix-key)
6477 (if (and (c-major-mode-is 'c++-mode) 6477 (if (and (c-major-mode-is 'c++-mode)
6478 (match-beginning 2)) 6478 (match-beginning 3))
6479 ;; If the second submatch matches in C++ then 6479 ;; If the second submatch matches in C++ then
6480 ;; we're looking at an identifier that's a 6480 ;; we're looking at an identifier that's a
6481 ;; prefix only if it specifies a member pointer. 6481 ;; prefix only if it specifies a member pointer.