summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2008-05-11 20:32:33 +0000
committerJuri Linkov <juri@jurta.org>2008-05-11 20:32:33 +0000
commitfd3d78f2922a086fc053618b8133cc909f6035e6 (patch)
tree3d37cf637db26a3335d7c655f5195d54950deec9
parent3e7969807f31b58656c873822a0594016f5f7a66 (diff)
downloademacs-fd3d78f2922a086fc053618b8133cc909f6035e6.tar.gz
(Info-next-preorder): Let-bind `Info-history' to nil
before recursive call to `Info-next-preorder' to not add intermediate nodes to the history.
-rw-r--r--lisp/ChangeLog14
-rw-r--r--lisp/info.el6
2 files changed, 18 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93da1b84860..4f598e932bb 100644
--- 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 3c5f0993a3f..57a791f3e27 100644
--- 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"))))