Commit e1f2d14a authored by Lars Ingebrigtsen's avatar Lars Ingebrigtsen

Allow a prefix argument to find-library to pop to a different window

* lisp/emacs-lisp/find-func.el (find-library): Allow a prefix
argument to pop to a different window (bug#2270).
parent 162f1853
......@@ -56,6 +56,10 @@ affected by this, as SGI stopped supporting IRIX in December 2013.
* Changes in Emacs 25.2
---
** `find-library' now takes a prefix argument to pop to a different
window.
** `find-library', `help-function-def' and `help-variable-def' now run
`find-function-after-hook'.
......
......@@ -255,9 +255,12 @@ TYPE should be nil to find a function, or `defvar' to find a variable."
(cons (current-buffer) (match-beginning 0))))
;;;###autoload
(defun find-library (library)
(defun find-library (library &optional other-window)
"Find the Emacs Lisp source of LIBRARY.
LIBRARY should be a string (the name of the library)."
LIBRARY should be a string (the name of the library). If the
optional OTHER-WINDOW argument (i.e., the command argument) is
specified, pop to a different window before displaying the
buffer."
(interactive
(let* ((dirs (or find-function-source-path load-path))
(suffixes (find-library-suffixes))
......@@ -279,15 +282,17 @@ LIBRARY should be a string (the name of the library)."
(when (and def (not (test-completion def table)))
(setq def nil))
(list
(completing-read (if def (format "Library name (default %s): " def)
(completing-read (if def
(format "Library name (default %s): " def)
"Library name: ")
table nil nil nil nil def))))
(let ((buf (find-file-noselect (find-library-name library))))
(condition-case nil
(prog1
(switch-to-buffer buf)
(run-hooks 'find-function-after-hook))
(error (pop-to-buffer buf)))))
table nil nil nil nil def)
current-prefix-arg)))
(prog1
(funcall (if other-window
'pop-to-buffer
'pop-to-buffer-same-window)
(find-file-noselect (find-library-name library)))
(run-hooks 'find-function-after-hook)))
;;;###autoload
(defun find-function-search-for-symbol (symbol type library)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment