# HG changeset patch # User Richard M. Stallman # Date 772381478 0 # Node ID 518971c497f58fbdda504a04b48417d8c4ac78ba # Parent ae1a594ebb1d6171650aaf5b719badf6627a2729 (Info-next-preorder-1): New function. (Info-mouse-follow-nearest-node): Use that. (Info-follow-nearest-node): Use that. diff -r ae1a594ebb1d -r 518971c497f5 lisp/info.el --- a/lisp/info.el Thu Jun 23 14:02:40 1994 +0000 +++ b/lisp/info.el Thu Jun 23 14:24:38 1994 +0000 @@ -1073,11 +1073,23 @@ (list 'condition-case nil (cons 'progn (append body '(t))) '(error nil))) (defun Info-next-preorder () - "Go to the next node, popping up a level if there is none." + "Go to the next subnode, popping up a level if there is none." (interactive) - (cond ((Info-no-error (Info-next-menu-item)) ) - ((Info-no-error (Info-up)) (forward-line 1)) - (t (error "No more nodes")))) + (cond ((Info-no-error (Info-next-menu-item))) + ((Info-no-error (Info-up)) + (forward-line 1)) + (t + (error "No more nodes")))) + +(defun Info-next-preorder-1 () + "Go to the next subnode or the next node, or go up a level." + (interactive) + (cond ((Info-no-error (Info-next-menu-item))) + ((Info-no-error (Info-next))) + ((Info-no-error (Info-up)) + (forward-line 1)) + (t + (error "No more nodes")))) (defun Info-last-preorder () "Go to the last node, popping up a level if there is none." @@ -1300,7 +1312,7 @@ (goto-char pos)) (and (not (Info-try-follow-nearest-node)) (save-excursion (forward-line 1) (eobp)) - (Info-next-preorder))) + (Info-next-preorder-1))) (defun Info-follow-nearest-node () "\\Follow a node reference near point. @@ -1308,7 +1320,7 @@ If no reference to follow, moves to the next node, or up if none." (interactive) (or (Info-try-follow-nearest-node) - (Info-next-preorder))) + (Info-next-preorder-1))) ;; Common subroutine. (defun Info-try-follow-nearest-node ()