[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108075: Backport: Recognize Objective-C methods also in c-defun-name

[Leo Liu]

------------------------------------------------------------
revno: 108075
fixes bug: http://debbugs.gnu.org/7879
author: Jan D. <address@hidden>
committer: Leo Liu <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-07-21 03:59:49 +0800
message:
  Backport: Recognize Objective-C methods also in c-defun-name
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-cmds.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-20 11:36:41 +0000
+++ b/lisp/ChangeLog    2012-07-20 19:59:49 +0000
@@ -11,6 +11,11 @@
        * progmodes/cperl-mode.el (cperl-unwind-to-safe): Don't inf-loop at end
        of narrowed buffer (bug#11966).
 
+2012-07-14  Jan Djärv  <address@hidden>
+
+       * progmodes/cc-cmds.el (c-defun-name): Recognize Objective-C methods
+       also (Bug#7879).
+
 2012-07-09  Stefan Monnier  <address@hidden>
 
        * progmodes/sh-script.el (sh-syntax-propertize-function): Fix last

=== modified file 'lisp/progmodes/cc-cmds.el'
--- a/lisp/progmodes/cc-cmds.el 2012-04-16 20:01:44 +0000
+++ b/lisp/progmodes/cc-cmds.el 2012-07-20 19:59:49 +0000
@@ -1826,6 +1826,15 @@
            ;; 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)