* subr.el (locate-library): Move from help-fns.el.

* help-fns.el (locate-library): Move to subr.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e6976349d1bb15a20332612b98e66be976b807d..0da6914059f828154233e0b8800781e05dc66210 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-28  Romain Francoise  <romain@orebokech.com>
+
+       * subr.el (locate-library): Move from help-fns.el.
+       * help-fns.el (locate-library): Move to subr.el.
+
 2005-10-28  Richard M. Stallman  <rms@gnu.org>
 
        * net/tramp.el (tramp-completion-mode): defvar moved up.
@@ -20,7 +25,7 @@
        * textmodes/flyspell.el (flyspell-large-region): Pass -t if Tex file.
        (flyspell-external-point-words): Error if misspelled word is not found.
        Set flyspell-large-region-beg at end of word.
-       
+
 2005-10-28  Andreas Schwab  <schwab@suse.de>
 
        * view.el (View-revert-buffer-scroll-page-forward): Use

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index b39d92cf3be0e54f2260883726e0c45654703469..cffe313fd6c0a6204745d27575f48df0080dcc42 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -100,34 +100,6 @@ With ARG, you are asked to choose which language."
       (setq buffer-undo-list nil)
       (set-buffer-modified-p nil))))
 
-;;;###autoload
-(defun locate-library (library &optional nosuffix path interactive-call)
-  "Show the precise file name of Emacs library LIBRARY.
-This command searches the directories in `load-path' like `\\[load-library]'
-to find the file that `\\[load-library] RET LIBRARY RET' would load.
-Optional second arg NOSUFFIX non-nil means don't add suffixes `load-suffixes'
-to the specified name LIBRARY.
-
-If the optional third arg PATH is specified, that list of directories
-is used instead of `load-path'.
-
-When called from a program, the file name is normaly returned as a
-string.  When run interactively, the argument INTERACTIVE-CALL is t,
-and the file name is displayed in the echo area."
-  (interactive (list (completing-read "Locate library: "
-                                     'locate-file-completion
-                                     (cons load-path load-suffixes))
-                    nil nil
-                    t))
-  (let ((file (locate-file library
-                          (or path load-path)
-                          (append (unless nosuffix load-suffixes) '("")))))
-    (if interactive-call
-       (if file
-           (message "Library is file %s" (abbreviate-file-name file))
-         (message "No library %s in search path" library)))
-    file))
-
 \f
 ;; Functions
 

diff --git a/lisp/subr.el b/lisp/subr.el
index 04b36897f3992d982e7d407522fefe790ed1453e..26a741f91e4667d367fcca89dee5c57eb7474378 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1309,6 +1309,34 @@ definition only or variable definition only.
        (setq files (cdr files)))
       file)))
 
+;;;###autoload
+(defun locate-library (library &optional nosuffix path interactive-call)
+  "Show the precise file name of Emacs library LIBRARY.
+This command searches the directories in `load-path' like `\\[load-library]'
+to find the file that `\\[load-library] RET LIBRARY RET' would load.
+Optional second arg NOSUFFIX non-nil means don't add suffixes `load-suffixes'
+to the specified name LIBRARY.
+
+If the optional third arg PATH is specified, that list of directories
+is used instead of `load-path'.
+
+When called from a program, the file name is normaly returned as a
+string.  When run interactively, the argument INTERACTIVE-CALL is t,
+and the file name is displayed in the echo area."
+  (interactive (list (completing-read "Locate library: "
+                                     'locate-file-completion
+                                     (cons load-path load-suffixes))
+                    nil nil
+                    t))
+  (let ((file (locate-file library
+                          (or path load-path)
+                          (append (unless nosuffix load-suffixes) '("")))))
+    (if interactive-call
+       (if file
+           (message "Library is file %s" (abbreviate-file-name file))
+         (message "No library %s in search path" library)))
+    file))
+
 \f
 ;;;; Specifying things to do later.