From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 31 Mar 2008 22:12:22 +0000 (+0000)
Subject: (find-function-search-for-symbol): Strip extension from .emacs.el to
X-Git-Tag: emacs-pretest-22.2.90~269
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2966eaebc8ee7de693cd5abbf4a5edfc08a59fb9;p=emacs.git

(find-function-search-for-symbol): Strip extension from .emacs.el to
make sure symbol is searched in .emacs too.
---

diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 9fe700d9b7f..2022d3ab7d4 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -231,8 +231,12 @@ The search is done in the source for library LIBRARY."
     (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)