Mercurial > emacs
comparison lisp/info.el @ 69128:ab159a9e1d0a
(Info-search): Don't bind search-spaces-regexp to
Info-search-whitespace-regexp in non-regexp isearch mode.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Thu, 23 Feb 2006 21:41:41 +0000 |
| parents | 3399fee3fc7e |
| children | bbbd0ad05f29 34c8b755296d |
comparison
equal
deleted
inserted
replaced
| 69127:a7ce66a8df73 | 69128:ab159a9e1d0a |
|---|---|
| 1640 ;; Skip Tag Table node | 1640 ;; Skip Tag Table node |
| 1641 (save-excursion | 1641 (save-excursion |
| 1642 (and (search-backward "\^_" nil t) | 1642 (and (search-backward "\^_" nil t) |
| 1643 (looking-at | 1643 (looking-at |
| 1644 "\^_\n\\(Tag Table\\|Local Variables\\)")))))) | 1644 "\^_\n\\(Tag Table\\|Local Variables\\)")))))) |
| 1645 (let ((search-spaces-regexp Info-search-whitespace-regexp)) | 1645 (let ((search-spaces-regexp |
| 1646 (if (or (not isearch-mode) isearch-regexp) | |
| 1647 Info-search-whitespace-regexp))) | |
| 1646 (if (if backward | 1648 (if (if backward |
| 1647 (re-search-backward regexp bound t) | 1649 (re-search-backward regexp bound t) |
| 1648 (re-search-forward regexp bound t)) | 1650 (re-search-forward regexp bound t)) |
| 1649 (setq found (point) beg-found (if backward (match-end 0) | 1651 (setq found (point) beg-found (if backward (match-end 0) |
| 1650 (match-beginning 0))) | 1652 (match-beginning 0))) |
| 1658 (signal 'search-failed (list regexp "initial node"))) | 1660 (signal 'search-failed (list regexp "initial node"))) |
| 1659 | 1661 |
| 1660 ;; If no subfiles, give error now. | 1662 ;; If no subfiles, give error now. |
| 1661 (if give-up | 1663 (if give-up |
| 1662 (if (null Info-current-subfile) | 1664 (if (null Info-current-subfile) |
| 1663 (let ((search-spaces-regexp Info-search-whitespace-regexp)) | 1665 (let ((search-spaces-regexp |
| 1666 (if (or (not isearch-mode) isearch-regexp) | |
| 1667 Info-search-whitespace-regexp))) | |
| 1664 (if backward | 1668 (if backward |
| 1665 (re-search-backward regexp) | 1669 (re-search-backward regexp) |
| 1666 (re-search-forward regexp))) | 1670 (re-search-forward regexp))) |
| 1667 (setq found nil))) | 1671 (setq found nil))) |
| 1668 | 1672 |
| 1729 ;; Skip Tag Table node | 1733 ;; Skip Tag Table node |
| 1730 (save-excursion | 1734 (save-excursion |
| 1731 (and (search-backward "\^_" nil t) | 1735 (and (search-backward "\^_" nil t) |
| 1732 (looking-at | 1736 (looking-at |
| 1733 "\^_\n\\(Tag Table\\|Local Variables\\)")))))) | 1737 "\^_\n\\(Tag Table\\|Local Variables\\)")))))) |
| 1734 (let ((search-spaces-regexp Info-search-whitespace-regexp)) | 1738 (let ((search-spaces-regexp |
| 1739 (if (or (not isearch-mode) isearch-regexp) | |
| 1740 Info-search-whitespace-regexp))) | |
| 1735 (if (if backward | 1741 (if (if backward |
| 1736 (re-search-backward regexp nil t) | 1742 (re-search-backward regexp nil t) |
| 1737 (re-search-forward regexp nil t)) | 1743 (re-search-forward regexp nil t)) |
| 1738 (setq found (point) beg-found (if backward (match-end 0) | 1744 (setq found (point) beg-found (if backward (match-end 0) |
| 1739 (match-beginning 0))) | 1745 (match-beginning 0))) |