2 files changed, 9 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0db9e218c1d..fa5da5c1435 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * info.el (Info-insert-breadcrumbs): Be careful to preserve history.
+
 2008-06-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * term/linux.el (terminal-init-linux): Load t-mouse.
diff --git a/lisp/info.el b/lisp/info.el
index ae62e9dd3f6..b274c8258a4 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -681,9 +681,8 @@ it says do not attempt further (recursive) error recovery."
   ;; Record the node we are leaving, if we were in one.
   (and (not no-going-back)
        Info-current-file
-       (setq Info-history
-             (cons (list Info-current-file Info-current-node (point))
-                   Info-history)))
+       (push (list Info-current-file Info-current-node (point))
+             Info-history))
   (Info-find-node-2 filename nodename no-going-back))
 
 ;;;###autoload
@@ -3726,8 +3725,9 @@ the variable `Info-file-list-for-emacs'."
           (let ((up (Info-extract-pointer "up")))
             (push up crumbs)
             (setq depth (1- depth))
-            (Info-goto-node up)))
-      (Info-goto-node onode)
+            (Info-find-node Info-current-file up 'no-going-back)))
+      (if crumbs                  ;Do bother going back if we haven't moved.
+          (Info-find-node Info-current-file onode 'no-going-back))
       ;; Add bottom node.
       (when Info-use-header-line
         ;; Let it disappear if crumbs is nil.