apply patch from Seiji Zenitani to find doc strings in ns*.m files

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df9eb674dd402ad21ae822052882e5895d85d697..0a1a6b32eb036d56a3eabb71f4ad415ce87a307f 100644 (file)
--- 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 efae0d1cdc8e1d6f12b2f40cf43ed37b55a730d0..015e75723ddadc3b28c5376425a534e322012240 100644 (file)
--- 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 f2e9b1e1b985e734d2ba7248f91e5c530ada4cfa..d251ab0e3496b904a9c342a93ee10a99be57138f 100644 (file)
--- 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)))))