diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-28 13:19:10 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-28 13:19:10 +0000 |
| commit | 14f798ff7e357b537ff47f65041588a153530621 (patch) | |
| tree | 4d46cf6c4a79a5103612d91884b7172d3aa124f6 /lisp | |
| parent | ddaa36e16efa267f40158baca709a58d2d748743 (diff) | |
| download | emacs-14f798ff7e357b537ff47f65041588a153530621.tar.gz emacs-14f798ff7e357b537ff47f65041588a153530621.tar.bz2 emacs-14f798ff7e357b537ff47f65041588a153530621.zip | |
apply patch from Seiji Zenitani to find doc strings in ns*.m files
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/find-func.el | 2 | ||||
| -rw-r--r-- | lisp/help-fns.el | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df9eb674dd4..0a1a6b32eb0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index efae0d1cdc8..015e75723dd 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -239,7 +239,7 @@ The search is done in the source for library LIBRARY." ;; 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)))) diff --git a/lisp/help-fns.el b/lisp/help-fns.el index f2e9b1e1b98..d251ab0e349 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -149,9 +149,11 @@ KIND should be `var' for a variable or `subr' for a subroutine." (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))))) |