Mercurial > emacs
changeset 66508:ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
* help-fns.el (locate-library): Move to subr.el.
| author | Romain Francoise <romain@orebokech.com> |
|---|---|
| date | Fri, 28 Oct 2005 16:55:48 +0000 |
| parents | fcde30dab36e |
| children | 77965ea08860 |
| files | lisp/ChangeLog lisp/help-fns.el lisp/subr.el |
| diffstat | 3 files changed, 34 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Oct 28 16:44:46 2005 +0000 +++ b/lisp/ChangeLog Fri Oct 28 16:55:48 2005 +0000 @@ -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
--- a/lisp/help-fns.el Fri Oct 28 16:44:46 2005 +0000 +++ b/lisp/help-fns.el Fri Oct 28 16:55:48 2005 +0000 @@ -100,34 +100,6 @@ (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
--- a/lisp/subr.el Fri Oct 28 16:44:46 2005 +0000 +++ b/lisp/subr.el Fri Oct 28 16:55:48 2005 +0000 @@ -1309,6 +1309,34 @@ (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.