(Info-next-preorder): Let-bind `Info-history' to nil

before recursive call to `Info-next-preorder' to not add
intermediate nodes to the history.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93da1b848601cdb80fceb296e55fa48ef12208c6..4f598e932bb99ceb1f21649a04bc7127af57fc5e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2008-05-11  Juri Linkov  <juri@jurta.org>
+
+       * wid-edit.el (widget-image-directory): Change default image data
+       subdirectory from "custom" to "images/custom".
+
+       * info.el (Info-next-preorder): Let-bind `Info-history' to nil
+       before recursive call to `Info-next-preorder' to not add
+       intermediate nodes to the history.
+
+       * isearch.el: Put isearch-scroll property on recenter-top-bottom.
+
+       * emulation/cua-base.el: Put isearch-scroll property
+       on cua-scroll-up and cua-scroll-down.
+
 2008-05-11  Eric S. Raymond  <esr@snark.thyrsus.com>
 
        * vc-hooks.el (vc-recompute-state): Removed (dead code).

diff --git a/lisp/info.el b/lisp/info.el
index 3c5f0993a3f3c78e7654016a44df62e79c4b6328..57a791f3e27b59e7381b67b8f7682e583f7ec465 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2526,8 +2526,10 @@ N is the digit argument used to invoke this command."
         ;; go up to the end of this node.
         (goto-char (point-max))
         ;; Since logically we are done with the node with that menu,
-        ;; move on from it.
-        (Info-next-preorder))
+        ;; move on from it.  But don't add intermediate nodes
+        ;; to the history on recursive calls.
+        (let (Info-history)
+          (Info-next-preorder)))
        (t
         (error "No more nodes"))))