diff options
| author | Leo Liu | 2012-07-21 09:41:48 +0800 |
|---|---|---|
| committer | Leo Liu | 2012-07-21 09:41:48 +0800 |
| commit | 2c73e345cc666982dbcb9d73e4fdd5a3348d19bc (patch) | |
| tree | 44606488ac39afff067e68c224f4171e3b6b2336 | |
| parent | 3646bcd6b8d321bbcf08bf8204ad92bdd3f1f0da (diff) | |
| download | emacs-2c73e345cc666982dbcb9d73e4fdd5a3348d19bc.tar.gz emacs-2c73e345cc666982dbcb9d73e4fdd5a3348d19bc.zip | |
Use match-string-no-properties instead in c-defun-name
for consistency.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cc-cmds.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f305d971a0f..9cda817fab6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-07-21 Leo Liu <sdl.web@gmail.com> | ||
| 2 | |||
| 3 | * progmodes/cc-cmds.el (c-defun-name): Use | ||
| 4 | match-string-no-properties instead for consistency. | ||
| 5 | |||
| 1 | 2012-07-20 Leo Liu <sdl.web@gmail.com> | 6 | 2012-07-20 Leo Liu <sdl.web@gmail.com> |
| 2 | 7 | ||
| 3 | * progmodes/cc-cmds.el (c-defun-name): Handle objc selectors properly. | 8 | * progmodes/cc-cmds.el (c-defun-name): Handle objc selectors properly. |
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 3ec7386ece0..daa2e455c28 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el | |||
| @@ -1832,9 +1832,9 @@ with a brace block." | |||
| 1832 | (kw-re (concat "\\(?:" c-symbol-key "\\)?:")) | 1832 | (kw-re (concat "\\(?:" c-symbol-key "\\)?:")) |
| 1833 | (stretches)) | 1833 | (stretches)) |
| 1834 | (when (c-syntactic-re-search-forward c-symbol-key bound t t t) | 1834 | (when (c-syntactic-re-search-forward c-symbol-key bound t t t) |
| 1835 | (push (match-string 0) stretches) | 1835 | (push (match-string-no-properties 0) stretches) |
| 1836 | (while (c-syntactic-re-search-forward kw-re bound t t t) | 1836 | (while (c-syntactic-re-search-forward kw-re bound t t t) |
| 1837 | (push (match-string 0) stretches))) | 1837 | (push (match-string-no-properties 0) stretches))) |
| 1838 | (apply 'concat (nreverse stretches)))) | 1838 | (apply 'concat (nreverse stretches)))) |
| 1839 | 1839 | ||
| 1840 | (t | 1840 | (t |