From b24e84ab41942e4f7bb7574df59bb1cf1f8aebdf Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 15 Dec 2000 22:03:05 +0000 Subject: [PATCH] (Info-forward-node): If the node has an Info-header-line, widen the buffer before searching for "next:" and "up:" pointers, and set the search limit to stay in the current node. --- lisp/ChangeLog | 7 +++++++ lisp/info.el | 22 ++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c16ab3fba57..773fd487db9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2000-12-15 Eli Zaretskii + + * info.el (Info-forward-node): If the node has an + Info-header-line, widen the buffer before searching for "next:" + and "up:" pointers, and set the search limit to stay in the + current node. + 2000-12-16 Miles Bader * simple.el (delete-trailing-whitespace): Remove extraneous let. diff --git a/lisp/info.el b/lisp/info.el index 3b2e675f7f1..21e32e76a4b 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1521,10 +1521,28 @@ N is the digit argument used to invoke this command." (not (string-match "\\" Info-current-node))) (Info-goto-node (Info-extract-menu-counting 1)) t) - ((save-excursion (search-backward "next:" nil t)) + ((save-excursion + (save-restriction + (let (limit) + (when Info-header-line + (goto-char (point-min)) + (widen) + (forward-line -1) + (setq limit (point)) + (forward-line 1)) + (search-backward "next:" limit t)))) (Info-next) t) - ((and (save-excursion (search-backward "up:" nil t)) + ((and (save-excursion + (save-restriction + (let (limit) + (when Info-header-line + (goto-char (point-min)) + (widen) + (forward-line -1) + (setq limit (point)) + (forward-line 1)) + (search-backward "up:" limit t)))) ;; Use string-equal, not equal, to ignore text props. (not (string-equal (downcase (Info-extract-pointer "up")) "top"))) -- 2.39.2