# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1207001542 0
# Node ID 7f06131fe112c3868c84fcbfa89f8ac3433fcdef
# Parent  5f25ace3fc904e3de50680d10901c5058ebcc9c7
(find-function-search-for-symbol): Strip extension from .emacs.el to
make sure symbol is searched in .emacs too.

diff -r 5f25ace3fc90 -r 7f06131fe112 lisp/emacs-lisp/find-func.el
--- a/lisp/emacs-lisp/find-func.el	Mon Mar 31 22:11:58 2008 +0000
+++ b/lisp/emacs-lisp/find-func.el	Mon Mar 31 22:12:22 2008 +0000
@@ -231,8 +231,12 @@
     (setq symbol (get symbol 'definition-name)))
   (if (string-match "\\`src/\\(.*\\.c\\)\\'" library)
       (find-function-C-source symbol (match-string 1 library) type)
-    (if (string-match "\\.el\\(c\\)\\'" library)
-	(setq library (substring library 0 (match-beginning 1))))
+    (when (string-match "\\.el\\(c\\)\\'" library)
+      (setq library (substring library 0 (match-beginning 1))))
+    ;; Strip extension from .emacs.el to make sure symbol is searched in
+    ;; .emacs too.
+    (when (string-match "\\.emacs\\(.el\\)" library)
+      (setq library (substring library 0 (match-beginning 1))))
     (let* ((filename (find-library-name library))
 	   (regexp-symbol (cdr (assq type find-function-regexp-alist))))
       (with-current-buffer (find-file-noselect filename)