[Emacs-diffs] /srv/bzr/emacs/trunk r105855: * lisp/info.el (Info-last-preorder): Visit last menu item only when

[Juri Linkov]

------------------------------------------------------------
revno: 105855
fixes bug(s): http://debbugs.gnu.org/9528
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Tue 2011-09-20 19:28:07 +0300
message:
  * 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).
modified:
  lisp/ChangeLog
  lisp/info.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-20 14:08:04 +0000
+++ b/lisp/ChangeLog    2011-09-20 16:28:07 +0000
@@ -1,3 +1,8 @@
+2011-09-20  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * password-cache.el (password-cache-remove): Remove entries even if the

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2011-09-18 20:14:16 +0000
+++ b/lisp/info.el      2011-09-20 16:28:07 +0000
@@ -2760,11 +2760,12 @@
 (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