mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-16 17:19:41 +00:00
Code Issues Releases Activity

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

Browse Source 
* help-fns.el (locate-library): Move to subr.el.
This commit is contained in:
Romain Francoise 2005-10-28 16:55:48 +00:00
parent 107fb6c995
commit 059a552c5c
3 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -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

28
lisp/help-fns.el
View File

@ -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

28
lisp/subr.el
View File

@ -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.