aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2012-12-02 14:41:22 +0800
committerChong Yidong2012-12-02 14:41:22 +0800
commit010db6da6527d16736fd3c2b607058dd35a70c9a (patch)
tree7b9112aae9b3a24682ed4bd27d06105facc751bd
parent3faf4944316a1efc840bd6dffe4315ea30a0f0e8 (diff)
downloademacs-010db6da6527d16736fd3c2b607058dd35a70c9a.tar.gz
emacs-010db6da6527d16736fd3c2b607058dd35a70c9a.zip
* info.el (info-display-manual): Add completion.
Fixes: debbugs:10771
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/info.el10
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51756972f4a..6032211b76f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
12012-12-02 Juri Linkov <juri@jurta.org> 12012-12-02 Juri Linkov <juri@jurta.org>
2 2
3 * info.el (info-display-manual): Don't clobber an existing Info 3 * info.el (info-display-manual): Don't clobber an existing Info
4 buffer (Bug#10770). 4 buffer (Bug#10770). Add completion (Bug#10771).
5 5
62012-12-01 Yuya Nishihara <yuya@tcha.org> (tiny change) 62012-12-01 Yuya Nishihara <yuya@tcha.org> (tiny change)
7 7
diff --git a/lisp/info.el b/lisp/info.el
index f22b39769b1..6149c3fcd80 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -5100,7 +5100,15 @@ type returned by `Info-bookmark-make-record', which see."
5100 "Display an Info buffer displaying MANUAL. 5100 "Display an Info buffer displaying MANUAL.
5101If there is an existing Info buffer for MANUAL, display it. 5101If there is an existing Info buffer for MANUAL, display it.
5102Otherwise, visit the manual in a new Info buffer." 5102Otherwise, visit the manual in a new Info buffer."
5103 (interactive "sManual name: ") 5103 (interactive
5104 (list
5105 (progn
5106 (info-initialize)
5107 (completing-read "Manual name: "
5108 (apply-partially 'Info-read-node-name-2
5109 Info-directory-list
5110 (mapcar 'car Info-suffix-list))
5111 nil t))))
5104 (let ((blist (buffer-list)) 5112 (let ((blist (buffer-list))
5105 (manual-re (concat "\\(/\\|\\`\\)" manual "\\(\\.\\|\\'\\)")) 5113 (manual-re (concat "\\(/\\|\\`\\)" manual "\\(\\.\\|\\'\\)"))
5106 (case-fold-search t) 5114 (case-fold-search t)