diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 2 |
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 @@ | |||
| 1 | 2011-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 | |||
| 1 | 2011-04-24 Chong Yidong <cyd@stupidchicken.com> | 6 | 2011-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. |