Mercurial > emacs
changeset 97060:a5fc76bb12d1
apply patch from Seiji Zenitani to find doc strings in ns*.m files
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Mon, 28 Jul 2008 13:19:10 +0000 |
| parents | 984f2ac5a637 |
| children | 2104d5663cdd |
| files | lisp/ChangeLog lisp/emacs-lisp/find-func.el lisp/help-fns.el |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jul 28 12:25:11 2008 +0000 +++ b/lisp/ChangeLog Mon Jul 28 13:19:10 2008 +0000 @@ -1,3 +1,8 @@ +2008-07-28 Seiji Zenitani <zenitani <at> mac.com> + + * help-fns.el (help-C-file-name): Add .m (Obj-C code) for Cocoa port. + * emacs-lisp/find-func.el (find-function-search-for-symbol): Likewise. + 2008-07-28 Stephen Leake <stephen_leake@stephe-leake.org> * progmodes/ada-mode.el (ada-mode): Clean up XEmacs handling.
--- a/lisp/emacs-lisp/find-func.el Mon Jul 28 12:25:11 2008 +0000 +++ b/lisp/emacs-lisp/find-func.el Mon Jul 28 13:19:10 2008 +0000 @@ -239,7 +239,7 @@ ;; that defines something else. (while (and (symbolp symbol) (get symbol 'definition-name)) (setq symbol (get symbol 'definition-name))) - (if (string-match "\\`src/\\(.*\\.c\\)\\'" library) + (if (string-match "\\`src/\\(.*\\.\\(c\\|m\\)\\)\\'" library) (find-function-C-source symbol (match-string 1 library) type) (when (string-match "\\.el\\(c\\)\\'" library) (setq library (substring library 0 (match-beginning 1))))
--- a/lisp/help-fns.el Mon Jul 28 12:25:11 2008 +0000 +++ b/lisp/help-fns.el Mon Jul 28 13:19:10 2008 +0000 @@ -149,9 +149,11 @@ (if (member file build-files) (throw 'loop file) (goto-char pnt)))))))) - (if (string-match "\\.\\(o\\|obj\\)\\'" file) - (setq file (replace-match ".c" t t file))) - (if (string-match "\\.c\\'" file) + (if (string-match "^ns.*\\(\\.o\\|obj\\)\\'" file) + (setq file (replace-match ".m" t t file 1)) + (if (string-match "\\.\\(o\\|obj\\)\\'" file) + (setq file (replace-match ".c" t t file)))) + (if (string-match "\\.\\(c\\|m\\)\\'" file) (concat "src/" file) file)))))