summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/info.el7
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 @@
+2012-12-02 Juri Linkov <juri@jurta.org>
+
+ * info.el (info-display-manual): Don't clobber an existing Info
+ buffer (Bug#10770).
+
2012-12-01 Yuya Nishihara <yuya@tcha.org> (tiny change)
* 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."
;;;###autoload
(defun info-display-manual (manual)
- "Go to Info buffer that displays MANUAL, creating it if none already exists."
+ "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."
(interactive "sManual name: ")
(let ((blist (buffer-list))
(manual-re (concat "\\(/\\|\\`\\)" manual "\\(\\.\\|\\'\\)"))
@@ -5113,7 +5115,8 @@ type returned by `Info-bookmark-make-record', which see."
(if found
(switch-to-buffer found)
(info-initialize)
- (info (Info-find-file manual)))))
+ (info (Info-find-file manual)
+ (generate-new-buffer-name "*info*")))))
(provide 'info)