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

[Juri Linkov]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.406 emacs/lisp/info.el:1.407
*** emacs/lisp/info.el:1.406    Thu Oct 28 09:01:13 2004
--- emacs/lisp/info.el  Fri Nov  5 19:06:24 2004
***************
*** 1476,1486 ****
        (save-excursion
        (save-restriction
          (widen)
          (while (and (not give-up)
                      (or (null found)
                          (if backward
                                (isearch-range-invisible found beg-found)
!                             (isearch-range-invisible beg-found found))))
            (if (if backward
                      (re-search-backward regexp bound t)
                    (re-search-forward regexp bound t))
--- 1476,1496 ----
        (save-excursion
        (save-restriction
          (widen)
+         (when backward
+           ;; Hide Info file header for backward search
+           (narrow-to-region (save-excursion
+                               (goto-char (point-min))
+                               (search-forward "\n\^_")
+                               (1- (point)))
+                             (point-max)))
          (while (and (not give-up)
                      (or (null found)
                          (if backward
                                (isearch-range-invisible found beg-found)
!                             (isearch-range-invisible beg-found found))
!                           ;; Skip node header line
!                           (save-excursion (forward-line -1)
!                                           (looking-at "\^_"))))
            (if (if backward
                      (re-search-backward regexp bound t)
                    (re-search-forward regexp bound t))
***************
*** 1531,1544 ****
              (while list
                (message "Searching subfile %s..." (cdr (car list)))
                (Info-read-subfile (car (car list)))
!                 (if backward (goto-char (point-max)))
                (setq list (cdr list))
                (setq give-up nil found nil)
                (while (and (not give-up)
                            (or (null found)
                                (if backward
                                      (isearch-range-invisible found beg-found)
!                                   (isearch-range-invisible beg-found found))))
                  (if (if backward
                            (re-search-backward regexp nil t)
                          (re-search-forward regexp nil t))
--- 1541,1564 ----
              (while list
                (message "Searching subfile %s..." (cdr (car list)))
                (Info-read-subfile (car (car list)))
!               (when backward
!                 ;; Hide Info file header for backward search
!                 (narrow-to-region (save-excursion
!                                     (goto-char (point-min))
!                                     (search-forward "\n\^_")
!                                     (1- (point)))
!                                   (point-max))
!                 (goto-char (point-max)))
                (setq list (cdr list))
                (setq give-up nil found nil)
                (while (and (not give-up)
                            (or (null found)
                                (if backward
                                      (isearch-range-invisible found beg-found)
!                                   (isearch-range-invisible beg-found found))
!                                 ;; Skip node header line
!                                 (save-excursion (forward-line -1)
!                                                 (looking-at "\^_"))))
                  (if (if backward
                            (re-search-backward regexp nil t)
                          (re-search-forward regexp nil t))