diff options
Diffstat (limited to 'lisp/progmodes/cc-cmds.el')
| -rw-r--r-- | lisp/progmodes/cc-cmds.el | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 9c8c5633b80..3ec7386ece0 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -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. |