Mercurial > emacs

changeset 95909:fcc6d97140b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Info-insert-breadcrumbs): Be careful to preserve history.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 14 Jun 2008 01:59:21 +0000
parents a69758a613b9
children e2798b886edf
files lisp/ChangeLog lisp/info.el
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Jun 13 21:59:41 2008 +0000
+++ b/lisp/ChangeLog	Sat Jun 14 01:59:21 2008 +0000
@@ -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.
--- a/lisp/info.el	Fri Jun 13 21:59:41 2008 +0000
+++ b/lisp/info.el	Sat Jun 14 01:59:21 2008 +0000
@@ -681,9 +681,8 @@
   ;; 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 @@
           (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.