summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/help-mode.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43cffffcb36..4200a7b7dda 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-16 Kelly Dean <kelly@prtime.org>
+
+ * help-mode.el (help-do-xref): Prevent duplicated display of Info
+ buffer, and prevent interference with existing buffer. (Bug#13190)
+
2015-02-16 Fabián Ezequiel Gallina <fgallina@gnu.org>
python.el: Do not deactivate mark on shell fontification. (Bug#19871)
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 564362a0c43..b8b129dbc4a 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -739,7 +739,8 @@ Things are set up properly so that the resulting help-buffer has
a proper [back] button."
;; There is a reference at point. Follow it.
(let ((help-xref-following t))
- (apply function args)))
+ (apply function (if (eq function 'info)
+ (append args (list (generate-new-buffer-name "*info*"))) args))))
;; The doc string is meant to explain what buttons do.
(defun help-follow-mouse ()