diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/info.el | 10 |
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 @@ | |||
| 1 | 2012-12-02 Juri Linkov <juri@jurta.org> | 1 | 2012-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 | ||
| 6 | 2012-12-01 Yuya Nishihara <yuya@tcha.org> (tiny change) | 6 | 2012-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. |
| 5101 | If there is an existing Info buffer for MANUAL, display it. | 5101 | If there is an existing Info buffer for MANUAL, display it. |
| 5102 | Otherwise, visit the manual in a new Info buffer." | 5102 | Otherwise, 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) |