From 112211d158b6b8a9090d6a3b53643411f5c8d74c Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 9 Sep 2002 19:24:53 +0000 Subject: [PATCH] (Info-search): Add (point-min) to subfile positions to get them right. Skip the current subfile using forward-line. --- lisp/info.el | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lisp/info.el b/lisp/info.el index 4acc8bf320c..e9db8638768 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1192,18 +1192,22 @@ If FORK is a string, it is the name to use for the new buffer." (progn (search-forward "\n\^_") (1- (point)))) (goto-char (point-min)) + ;; Find the subfile we just searched. (search-forward (concat "\n" osubfile ": ")) - (beginning-of-line) + ;; Skip that one. + (forward-line 1) + ;; Make a list of all following subfiles. + ;; Each elt has the form (VIRT-POSITION . SUBFILENAME). (while (not (eobp)) (re-search-forward "\\(^.*\\): [0-9]+$") (goto-char (+ (match-end 1) 2)) - (setq list (cons (cons (read (current-buffer)) + (setq list (cons (cons (+ (point-min) + (read (current-buffer))) (match-string-no-properties 1)) list)) (goto-char (1+ (match-end 0)))) - (setq list (nreverse list) - current (car (car list)) - list (cdr list)))) + ;; Put in forward order + (setq list (nreverse list)))) (while list (message "Searching subfile %s..." (cdr (car list))) (Info-read-subfile (car (car list))) -- 2.39.2