[Emacs-diffs] /srv/bzr/emacs/trunk r109088: *** empty log message ***

[Jan D.]

------------------------------------------------------------
revno: 109088
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2012-07-14 11:08:36 +0200
message:
  *** empty log message ***
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-cmds.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-14 05:32:23 +0000
+++ b/lisp/ChangeLog    2012-07-14 09:08:36 +0000
@@ -1,3 +1,8 @@
+2012-07-14  Jan Djärv  <address@hidden>
+
+       * progmodes/cc-cmds.el (c-defun-name): Recognize Objective-C methods
+       also (Bug#7879).
+
 2012-07-14  Chong Yidong  <address@hidden>
 
        * electric.el (electric-pair-post-self-insert-function): Fix pair

=== modified file 'lisp/progmodes/cc-cmds.el'
--- a/lisp/progmodes/cc-cmds.el 2012-06-02 10:56:09 +0000
+++ b/lisp/progmodes/cc-cmds.el 2012-07-14 09:08:36 +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)