Use prefix argument in `info-display-manual'

* lisp/info.el (info-display-manual): Limit the completion alternatives
to currently visited manuals if prefix argument is non-nil.

2 files changed, 16 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4203e05aed8..acafe24674a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-31  Filipp Gunbin  <fgunbin@fastmail.fm>
+
+        * info.el (info-display-manual): Limit the completion alternatives
+        to currently visited manuals if prefix argument is non-nil.
+
 2014-12-30  Paul Eggert  <eggert@cs.ucla.edu>
 
         * Makefile.in (semantic): Simplify.
diff --git a/lisp/info.el b/lisp/info.el
index 7c4d7f33231..33e982d3a77 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -5277,13 +5277,15 @@ type returned by `Info-bookmark-make-record', which see."
 (defun info-display-manual (manual)
   "Display an Info buffer displaying MANUAL.
 If there is an existing Info buffer for MANUAL, display it.
-Otherwise, visit the manual in a new Info buffer."
+Otherwise, visit the manual in a new Info buffer.  In interactive
+use, a prefix argument directs this command to limit the
+completion alternatives to currently visited manuals."
   (interactive
    (list
     (progn
       (info-initialize)
       (completing-read "Manual name: "
-                       (info--manual-names)
+                       (info--manual-names current-prefix-arg)
                        nil t))))
   (let ((blist (buffer-list))
         (manual-re (concat "\\(/\\|\\`\\)" manual "\\(\\.\\|\\'\\)"))
@@ -5302,7 +5304,7 @@ Otherwise, visit the manual in a new Info buffer."
       (info (Info-find-file manual)
             (generate-new-buffer-name "*info*")))))
 
-(defun info--manual-names ()
+(defun info--manual-names (visited-only)
   (let (names)
     (dolist (buffer (buffer-list))
       (with-current-buffer buffer
@@ -5313,11 +5315,12 @@ Otherwise, visit the manual in a new Info buffer."
                     (file-name-nondirectory Info-current-file))
                    names))))
     (delete-dups (append (nreverse names)
-                         (all-completions
-                          ""
-                          (apply-partially 'Info-read-node-name-2
-                                           Info-directory-list
-                                           (mapcar 'car Info-suffix-list)))))))
+                         (when (not visited-only)
+                           (all-completions
+                            ""
+                            (apply-partially 'Info-read-node-name-2
+                                             Info-directory-list
+                                             (mapcar 'car Info-suffix-list))))))))
 
 (provide 'info)