mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

* lisp/progmodes/cc-cmds.el (c-defun-name): Handle objc selectors properly.

Browse Source 
Fixes: debbugs:7879
This commit is contained in:
Leo Liu 2012-07-21 05:18:52 +08:00
parent fe1a523fd9
commit 3646bcd6b8
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -1,5 +1,8 @@
2012-07-20 Leo Liu <sdl.web@gmail.com>
* progmodes/cc-cmds.el (c-defun-name): Handle objc selectors properly.
(Bug#7879)
* progmodes/cc-langs.el (c-symbol-start): Include char _ (bug#11986).
2012-07-18 Stefan Monnier <monnier@iro.umontreal.ca>

18
lisp/progmodes/cc-cmds.el
View File

@ -1826,14 +1826,16 @@ with a brace block."
;; DEFFLAGSET(syslog_opt_flags,LOG_PID ...) ==> syslog_opt_flags
(match-string-no-properties 1))
;; Objective-C method starting with + or -.
((and (derived-mode-p 'objc-mode)
(looking-at "[-+]\s*("))
(when (c-syntactic-re-search-forward ")\s*" nil t)
(c-forward-token-2)
(setq name-end (point))
(c-backward-token-2)
(buffer-substring-no-properties (point) name-end)))
;; Objc selectors.
((assq 'objc-method-intro (c-guess-basic-syntax))
(let ((bound (save-excursion (c-end-of-statement) (point)))
(kw-re (concat "\\(?:" c-symbol-key "\\)?:"))
(stretches))
(when (c-syntactic-re-search-forward c-symbol-key bound t t t)
(push (match-string 0) stretches)
(while (c-syntactic-re-search-forward kw-re bound t t t)
(push (match-string 0) stretches)))
(apply 'concat (nreverse stretches))))
(t
;; Normal function or initializer.