summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/help-mode.el11
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 149eebb3d36..4499f5c48cb 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -195,14 +195,17 @@ Commands:
;;;###autoload
(defun help-mode-finish ()
+ (let ((entry (assq (selected-window) view-return-to-alist)))
+ (if entry (setcdr entry (cons (selected-window)
+ help-return-method))
+ (setq view-return-to-alist
+ (cons (cons (selected-window) help-return-method)
+ view-return-to-alist))))
(when (eq major-mode 'help-mode)
;; View mode's read-only status of existing *Help* buffer is lost
;; by with-output-to-temp-buffer.
(toggle-read-only 1)
- (help-make-xrefs (current-buffer)))
- (setq view-return-to-alist
- (list (cons (selected-window) help-return-method))))
-
+ (help-make-xrefs (current-buffer))))
;; Grokking cross-reference information in doc strings and
;; hyperlinking it.