diff options
| author | Juri Linkov <juri@jurta.org> | 2004-11-11 21:45:57 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2004-11-11 21:45:57 +0000 |
| commit | be4b3ae8beb76dac0ed37fcfde2b84fc872602a1 (patch) | |
| tree | cb725809700b36fb1f274689bb363fb8057a341b /lisp/info.el | |
| parent | 811cab86513cacca3cba5a27ca4ac0621ed28c5d (diff) | |
| download | emacs-be4b3ae8beb76dac0ed37fcfde2b84fc872602a1.tar.gz | |
(Info-search): Save match data for isearch. Skip Tag Table node.
Diffstat (limited to 'lisp/info.el')
| -rw-r--r-- | lisp/info.el | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/lisp/info.el b/lisp/info.el index baeec935ee7..cc7ed2ae59b 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1484,13 +1484,18 @@ If DIRECTION is `backward', search in the reverse direction." (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 "\^_")))) + (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)) @@ -1552,13 +1557,18 @@ If DIRECTION is `backward', search in the reverse direction." (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 "\^_")))) + (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)) |