diff options
| author | Juri Linkov <juri@jurta.org> | 2011-09-20 19:28:07 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2011-09-20 19:28:07 +0300 |
| commit | 5147931d624ce62d2382398859a06fa1f334fd56 (patch) | |
| tree | 7089a400197a796b216ad11af599de4aaf1c6ec3 | |
| parent | cf499a1a42695fb0ce3aee0b1e6b48a3078ddca3 (diff) | |
| download | emacs-5147931d624ce62d2382398859a06fa1f334fd56.tar.gz | |
* 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).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/info.el | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a1289fb7750..7e0da8727e1 100644 --- 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 e79e4b1195e..3fa35bb4d03 100644 --- 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 |