diff options
| author | Juri Linkov | 2012-12-02 14:22:32 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-12-02 14:22:32 +0800 |
| commit | 3faf4944316a1efc840bd6dffe4315ea30a0f0e8 (patch) | |
| tree | c4f1126a896ea5430d057d37269a6ee3fadd1db1 | |
| parent | 89eb3b0ae7dcb7ae819efd448899103b0d4ee93e (diff) | |
| download | emacs-3faf4944316a1efc840bd6dffe4315ea30a0f0e8.tar.gz emacs-3faf4944316a1efc840bd6dffe4315ea30a0f0e8.zip | |
* info.el (info-display-manual): Don't clobber an existing Info buffer.
Fixes: debbugs:10770
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/info.el | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ec7791597f0..51756972f4a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-02 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * info.el (info-display-manual): Don't clobber an existing Info | ||
| 4 | buffer (Bug#10770). | ||
| 5 | |||
| 1 | 2012-12-01 Yuya Nishihara <yuya@tcha.org> (tiny change) | 6 | 2012-12-01 Yuya Nishihara <yuya@tcha.org> (tiny change) |
| 2 | 7 | ||
| 3 | * vc/vc-hooks.el (vc-find-file-hook): Expand buffer-file-truename | 8 | * vc/vc-hooks.el (vc-find-file-hook): Expand buffer-file-truename |
diff --git a/lisp/info.el b/lisp/info.el index b0ef5c6bc4d..f22b39769b1 100644 --- a/lisp/info.el +++ b/lisp/info.el | |||
| @@ -5097,7 +5097,9 @@ type returned by `Info-bookmark-make-record', which see." | |||
| 5097 | 5097 | ||
| 5098 | ;;;###autoload | 5098 | ;;;###autoload |
| 5099 | (defun info-display-manual (manual) | 5099 | (defun info-display-manual (manual) |
| 5100 | "Go to Info buffer that displays MANUAL, creating it if none already exists." | 5100 | "Display an Info buffer displaying MANUAL. |
| 5101 | If there is an existing Info buffer for MANUAL, display it. | ||
| 5102 | Otherwise, visit the manual in a new Info buffer." | ||
| 5101 | (interactive "sManual name: ") | 5103 | (interactive "sManual name: ") |
| 5102 | (let ((blist (buffer-list)) | 5104 | (let ((blist (buffer-list)) |
| 5103 | (manual-re (concat "\\(/\\|\\`\\)" manual "\\(\\.\\|\\'\\)")) | 5105 | (manual-re (concat "\\(/\\|\\`\\)" manual "\\(\\.\\|\\'\\)")) |
| @@ -5113,7 +5115,8 @@ type returned by `Info-bookmark-make-record', which see." | |||
| 5113 | (if found | 5115 | (if found |
| 5114 | (switch-to-buffer found) | 5116 | (switch-to-buffer found) |
| 5115 | (info-initialize) | 5117 | (info-initialize) |
| 5116 | (info (Info-find-file manual))))) | 5118 | (info (Info-find-file manual) |
| 5119 | (generate-new-buffer-name "*info*"))))) | ||
| 5117 | 5120 | ||
| 5118 | (provide 'info) | 5121 | (provide 'info) |
| 5119 | 5122 | ||