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

[Miles Bader]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.304.2.19 emacs/lisp/info.el:1.304.2.20
*** emacs/lisp/info.el:1.304.2.19       Fri Oct 29 02:05:09 2004
--- emacs/lisp/info.el  Fri Nov 12 04:21:14 2004
***************
*** 657,666 ****
             (equal old-nodename Info-current-node))
        (progn
          ;; note goto-line is no good, we want to measure from point-min
!         (beginning-of-buffer)
          (forward-line wline)
          (set-window-start (selected-window) (point))
!         (beginning-of-buffer)
          (forward-line pline)
          (move-to-column pcolumn))
        ;; only add to the history when coming from a different file+node
--- 657,666 ----
             (equal old-nodename Info-current-node))
        (progn
          ;; note goto-line is no good, we want to measure from point-min
!         (goto-char (point-min))
          (forward-line wline)
          (set-window-start (selected-window) (point))
!         (goto-char (point-min))
          (forward-line pline)
          (move-to-column pcolumn))
        ;; only add to the history when coming from a different file+node
***************
*** 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,1501 ----
        (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)
!                     (save-match-data
!                       (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 "\^_"))
!                           ;; Skip Tag Table node
!                           (save-excursion
!                             (and (search-backward "\^_" nil t)
!                                  (looking-at "\^_\nTag Table"))))))
            (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))
--- 1546,1574 ----
              (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)
!                           (save-match-data
!                             (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 "\^_"))
!                                 ;; Skip Tag Table node
!                                 (save-excursion
!                                   (and (search-backward "\^_" nil t)
!                                        (looking-at "\^_\nTag Table"))))))
                  (if (if backward
                            (re-search-backward regexp nil t)
                          (re-search-forward regexp nil t))