Skip to content

GitLab

Commit ca53db33 authored by Juri Linkov's avatar Juri Linkov
Browse files

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

parent 3296d21b
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 3 deletions
lisp/info.el
View file @ ca53db33
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment