diff options
| author | Juri Linkov | 2004-11-11 21:45:57 +0000 |
|---|---|---|
| committer | Juri Linkov | 2004-11-11 21:45:57 +0000 |
| commit | be4b3ae8beb76dac0ed37fcfde2b84fc872602a1 (patch) | |
| tree | cb725809700b36fb1f274689bb363fb8057a341b | |
| parent | 811cab86513cacca3cba5a27ca4ac0621ed28c5d (diff) | |
| download | emacs-be4b3ae8beb76dac0ed37fcfde2b84fc872602a1.tar.gz emacs-be4b3ae8beb76dac0ed37fcfde2b84fc872602a1.zip | |
(Info-search): Save match data for isearch. Skip Tag Table node.
| -rw-r--r-- | lisp/ChangeLog | 14 | ||||
| -rw-r--r-- | lisp/info.el | 38 |
2 files changed, 38 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df4c5c51e7a..23ab5b5d4ef 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,17 @@ | |||
| 1 | 2004-11-11 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * info.el (Info-search): Save match data for isearch. | ||
| 4 | Skip Tag Table node. | ||
| 5 | |||
| 6 | * descr-text.el (describe-char): Replace syntax-after with code | ||
| 7 | from its previous version. | ||
| 8 | |||
| 9 | * files.el (magic-mode-alist): Use optimization for SGML mode too. | ||
| 10 | (set-auto-mode): Doc fix. Remove unused variable `xml'. | ||
| 11 | |||
| 12 | * international/mule.el (sgml-html-meta-auto-coding-function): | ||
| 13 | Remove > after <html to allow HTML attributes. | ||
| 14 | |||
| 1 | 2004-11-11 Jay Belanger <belanger@truman.edu> | 15 | 2004-11-11 Jay Belanger <belanger@truman.edu> |
| 2 | 16 | ||
| 3 | * calc/calc-comb.el (math-prime-factors-finished): Declared it as | 17 | * calc/calc-comb.el (math-prime-factors-finished): Declared it as |
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." | |||
| 1484 | (1- (point))) | 1484 | (1- (point))) |
| 1485 | (point-max))) | 1485 | (point-max))) |
| 1486 | (while (and (not give-up) | 1486 | (while (and (not give-up) |
| 1487 | (or (null found) | 1487 | (save-match-data |
| 1488 | (if backward | 1488 | (or (null found) |
| 1489 | (isearch-range-invisible found beg-found) | 1489 | (if backward |
| 1490 | (isearch-range-invisible beg-found found)) | 1490 | (isearch-range-invisible found beg-found) |
| 1491 | ;; Skip node header line | 1491 | (isearch-range-invisible beg-found found)) |
| 1492 | (save-excursion (forward-line -1) | 1492 | ;; Skip node header line |
| 1493 | (looking-at "\^_")))) | 1493 | (save-excursion (forward-line -1) |
| 1494 | (looking-at "\^_")) | ||
| 1495 | ;; Skip Tag Table node | ||
| 1496 | (save-excursion | ||
| 1497 | (and (search-backward "\^_" nil t) | ||
| 1498 | (looking-at "\^_\nTag Table")))))) | ||
| 1494 | (if (if backward | 1499 | (if (if backward |
| 1495 | (re-search-backward regexp bound t) | 1500 | (re-search-backward regexp bound t) |
| 1496 | (re-search-forward regexp bound t)) | 1501 | (re-search-forward regexp bound t)) |
| @@ -1552,13 +1557,18 @@ If DIRECTION is `backward', search in the reverse direction." | |||
| 1552 | (setq list (cdr list)) | 1557 | (setq list (cdr list)) |
| 1553 | (setq give-up nil found nil) | 1558 | (setq give-up nil found nil) |
| 1554 | (while (and (not give-up) | 1559 | (while (and (not give-up) |
| 1555 | (or (null found) | 1560 | (save-match-data |
| 1556 | (if backward | 1561 | (or (null found) |
| 1557 | (isearch-range-invisible found beg-found) | 1562 | (if backward |
| 1558 | (isearch-range-invisible beg-found found)) | 1563 | (isearch-range-invisible found beg-found) |
| 1559 | ;; Skip node header line | 1564 | (isearch-range-invisible beg-found found)) |
| 1560 | (save-excursion (forward-line -1) | 1565 | ;; Skip node header line |
| 1561 | (looking-at "\^_")))) | 1566 | (save-excursion (forward-line -1) |
| 1567 | (looking-at "\^_")) | ||
| 1568 | ;; Skip Tag Table node | ||
| 1569 | (save-excursion | ||
| 1570 | (and (search-backward "\^_" nil t) | ||
| 1571 | (looking-at "\^_\nTag Table")))))) | ||
| 1562 | (if (if backward | 1572 | (if (if backward |
| 1563 | (re-search-backward regexp nil t) | 1573 | (re-search-backward regexp nil t) |
| 1564 | (re-search-forward regexp nil t)) | 1574 | (re-search-forward regexp nil t)) |