* lisp/info.el (Info-last-preorder): Visit last menu item only when

`Info-scroll-prefer-subnodes' is non-nil (third test-case of bug#9528).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1289fb775045d3e90a3437c1b7fdc334a4d035e..7e0da8727e14e4e9b8cb395eaa9d13293de0c3e3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-20  Juri Linkov  <juri@jurta.org>
+
+       * info.el (Info-last-preorder): Visit last menu item only when
+       `Info-scroll-prefer-subnodes' is non-nil (third test-case of bug#9528).
+
 2011-09-20  Julien Danjou  <julien@danjou.info>
 
        * password-cache.el (password-cache-remove): Remove entries even if the

diff --git a/lisp/info.el b/lisp/info.el
index e79e4b1195e76fafb93fb808e97aa2f966424bec..3fa35bb4d03bfc7da019170368597708f84fddaa 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2760,11 +2760,12 @@ N is the digit argument used to invoke this command."
 (defun Info-last-preorder ()
   "Go to the last node, popping up a level if there is none."
   (interactive)
-  (cond ((Info-no-error
-         (Info-last-menu-item)
-         ;; If we go down a menu item, go to the end of the node
-         ;; so we can scroll back through it.
-         (goto-char (point-max)))
+  (cond ((and Info-scroll-prefer-subnodes
+             (Info-no-error
+              (Info-last-menu-item)
+              ;; If we go down a menu item, go to the end of the node
+              ;; so we can scroll back through it.
+              (goto-char (point-max))))
         ;; Keep going down, as long as there are nested menu nodes.
         (let (Info-history) ; Don't add intermediate nodes to the history.
           (while (Info-no-error