(help-xref-go-back): Restore POSITION in proper buffer and proper window.

1 files changed, 4 insertions, 2 deletions

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index e041f2f03e..d424ff4db7 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -560,8 +560,10 @@ help buffer."
 	      method (cadr item)
 	      args (cddr item))))
     (apply method args)
-    ;; FIXME: are we sure we're in the right buffer ?
-    (goto-char position)))
+    (with-current-buffer buffer
+      (if (get-buffer-window buffer)
+	  (set-window-point (get-buffer-window buffer) position)
+	(goto-char position)))))
 
 (defun help-go-back ()
   "Invoke the [back] button (if any) in the Help mode buffer."