mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 20:32:00 -08:00
Code Issues Projects Releases Wiki Activity

(Info-search): Don't search in node header lines and file headers.

Browse source
This commit is contained in:
Juri Linkov 2004-11-05 19:06:24 +00:00
parent 3296d21b53
commit ca53db337f
1 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lisp/info.el
View file

@ -1476,11 +1476,21 @@ If DIRECTION is `backward', search in the reverse direction."
(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))))
(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,14 +1541,24 @@ If DIRECTION is `backward', search in the reverse direction."
(while list
(message "Searching subfile %s..." (cdr (car list)))
(Info-read-subfile (car (car list)))
(if backward (goto-char (point-max)))
(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))))
(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))