From 059a552c5c93934197684028e255fbb69ce35f2e Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Fri, 28 Oct 2005 16:55:48 +0000 Subject: [PATCH] * subr.el (locate-library): Move from help-fns.el. * help-fns.el (locate-library): Move to subr.el. --- lisp/ChangeLog | 7 ++++++- lisp/help-fns.el | 28 ---------------------------- lisp/subr.el | 28 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1e6976349d1..0da6914059f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-10-28 Romain Francoise + + * subr.el (locate-library): Move from help-fns.el. + * help-fns.el (locate-library): Move to subr.el. + 2005-10-28 Richard M. Stallman * 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 * view.el (View-revert-buffer-scroll-page-forward): Use diff --git a/lisp/help-fns.el b/lisp/help-fns.el index b39d92cf3be..cffe313fd6c 100644 --- 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)) - ;; Functions diff --git a/lisp/subr.el b/lisp/subr.el index 04b36897f39..26a741f91e4 100644 --- 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)) + ;;;; Specifying things to do later. -- 2.39.2