# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1217251150 0
# Node ID a5fc76bb12d1972c382bab3f4a954179e7e6023d
# Parent  984f2ac5a637211a875019bff581c3014486c1e3
apply patch from Seiji Zenitani to find doc strings in ns*.m files

diff -r 984f2ac5a637 -r a5fc76bb12d1 lisp/ChangeLog
--- 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.
diff -r 984f2ac5a637 -r a5fc76bb12d1 lisp/emacs-lisp/find-func.el
--- 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))))
diff -r 984f2ac5a637 -r a5fc76bb12d1 lisp/help-fns.el
--- 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)))))