[Emacs-diffs] Changes to emacs/lisp/info.el

[Richard M. Stallman]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.315 emacs/lisp/info.el:1.316
*** emacs/lisp/info.el:1.315    Sun Jul 28 21:48:52 2002
--- emacs/lisp/info.el  Mon Sep  9 15:24:53 2002
***************
*** 1192,1209 ****
                                      (progn (search-forward "\n\^_")
                                             (1- (point))))
                    (goto-char (point-min))
                    (search-forward (concat "\n" osubfile ": "))
!                   (beginning-of-line)
                    (while (not (eobp))
                      (re-search-forward "\\(^.*\\): [0-9]+$")
                      (goto-char (+ (match-end 1) 2))
!                     (setq list (cons (cons (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))))
                (while list
                  (message "Searching subfile %s..." (cdr (car list)))
                  (Info-read-subfile (car (car list)))
--- 1192,1213 ----
                                      (progn (search-forward "\n\^_")
                                             (1- (point))))
                    (goto-char (point-min))
+                   ;; Find the subfile we just searched.
                    (search-forward (concat "\n" osubfile ": "))
!                   ;; 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 (+ (point-min)
!                                               (read (current-buffer)))
                                             (match-string-no-properties 1))
                                       list))
                      (goto-char (1+ (match-end 0))))
!                   ;; Put in forward order
!                   (setq list (nreverse list))))
                (while list
                  (message "Searching subfile %s..." (cdr (car list)))
                  (Info-read-subfile (car (car list)))