procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*** empty log message ***

Browse source
This commit is contained in:
Jan Djärv 2012-07-14 11:08:36 +02:00
parent b5cf7fc45c
commit 044080727c
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-07-14 Jan Djärv <jan.h.d@swipnet.se>
* progmodes/cc-cmds.el (c-defun-name): Recognize Objective-C methods
also (Bug#7879).
2012-07-14 Chong Yidong <cyd@gnu.org>
* electric.el (electric-pair-post-self-insert-function): Fix pair

9
lisp/progmodes/cc-cmds.el
View file

@ -1826,6 +1826,15 @@ 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)))
(t
;; Normal function or initializer.
(when (c-syntactic-re-search-forward "[{(]" nil t)