aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Francoise2006-11-21 20:06:53 +0000
committerRomain Francoise2006-11-21 20:06:53 +0000
commitfef1f0f2a53aefd5c3e44fc48c02aabb891232ba (patch)
treedc8f7c3d70441c72d8be535fc59e32046e0a5a24
parent2d1af8babff10f98d64dbdcf97dcefcc64ccd894 (diff)
downloademacs-fef1f0f2a53aefd5c3e44fc48c02aabb891232ba.tar.gz
emacs-fef1f0f2a53aefd5c3e44fc48c02aabb891232ba.zip
(find-library-name): Don't strip ".el" from library name (reverts change
of 2005-10-25).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/find-func.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index acd3fa760d2..2add6c88ba5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-11-21 Romain Francoise <romain@orebokech.com>
2
3 * emacs-lisp/find-func.el (find-library-name): Don't strip ".el"
4 from library name (reverts change of 2005-10-25).
5
12006-11-21 Lennart Borgman <lennart.borgman.073@student.lu.se> 62006-11-21 Lennart Borgman <lennart.borgman.073@student.lu.se>
2 7
3 * tutorial.el (tutorial--default-keys): Add newline and 8 * tutorial.el (tutorial--default-keys): Add newline and
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 10a052dc97e..a51493d22ea 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -147,9 +147,9 @@ See the functions `find-function' and `find-variable'."
147 147
148(defun find-library-name (library) 148(defun find-library-name (library)
149 "Return the absolute file name of the Lisp source of LIBRARY." 149 "Return the absolute file name of the Lisp source of LIBRARY."
150 ;; Strip off the extension to take advantage of library suffixes in 150 ;; If the library is byte-compiled, try to find a source library by
151 ;; the call to `locate-file'. 151 ;; the same name.
152 (if (string-match "\\.el\\(c\\(\\..*\\)?\\)?\\'" library) 152 (if (string-match "\\.el\\(c\\(\\..*\\)?\\)\\'" library)
153 (setq library (replace-match "" t t library))) 153 (setq library (replace-match "" t t library)))
154 (or (locate-file library 154 (or (locate-file library
155 (or find-function-source-path load-path) 155 (or find-function-source-path load-path)