mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-29 19:48:19 +00:00
Code Issues Releases Activity

(Info-last-preorder): Don't barf on nodes without a prev.

Browse Source 
(Info-scroll-down): Respect `Info-scroll-prefer-subnodes'.
This commit is contained in:
Miles Bader 2000-12-12 07:15:52 +00:00
parent 591b63b424
commit c2def7a092
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2000-12-12 Miles Bader <miles@gnu.org>
* info.el (Info-last-preorder): Don't barf on nodes without a prev.
(Info-scroll-down): Respect `Info-scroll-prefer-subnodes'.
2000-12-12 Andrew Choi <akochoi@i-cable.com>
* term/mac-win.el: Remove load for ls-lisp.

26
lisp/info.el
View File

@ -1612,7 +1612,8 @@ N is the digit argument used to invoke this command."
;; so we can scroll back through it.
(goto-char (point-max))))
(recenter -1))
((and (not (equal (Info-extract-pointer "up")
((and (Info-no-error (Info-extract-pointer "prev"))
(not (equal (Info-extract-pointer "up")
(Info-extract-pointer "prev"))))
(Info-no-error (Info-prev))
(goto-char (point-max))
@ -1664,22 +1665,25 @@ in other ways.)"
(defun Info-scroll-down ()
"Scroll one screenful back in Info, considering all nodes as one sequence.
Within the menu of a node, this goes to its last subnode.
When you scroll past the beginning of a node, that goes to the
previous node or back up to the parent node."
If point is within the menu of a node, and `Info-scroll-prefer-subnodes'
is non-nil, this goes to its last subnode. When you scroll past the
beginning of a node, that goes to the previous node or back up to the
parent node."
(interactive)
(if (or (< (window-start) (point-min))
(> (window-start) (point-max)))
(set-window-start (selected-window) (point)))
(let* ((case-fold-search t)
(current-point (point))
(virtual-end (save-excursion
(beginning-of-line)
(setq current-point (point))
(goto-char (point-min))
(search-forward "\n* Menu:"
current-point
t))))
(virtual-end
(and Info-scroll-prefer-subnodes
(save-excursion
(beginning-of-line)
(setq current-point (point))
(goto-char (point-min))
(search-forward "\n* Menu:"
current-point
t)))))
(if (or virtual-end (pos-visible-in-window-p (point-min)))
(Info-last-preorder)
(scroll-down))))