Mercurial > emacs
comparison lisp/isearch.el @ 91005:424b655804ca
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-246
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 13 Aug 2007 13:48:35 +0000 |
| parents | f55f9811f5d7 e5a68f18fcb9 |
| children | 14c4a6aac623 |
comparison
equal
deleted
inserted
replaced
| 91004:f72cf5b2ab11 | 91005:424b655804ca |
|---|---|
| 819 | 819 |
| 820 (let ((isearch-mode-end-hook-quit (and nopush (not edit)))) | 820 (let ((isearch-mode-end-hook-quit (and nopush (not edit)))) |
| 821 (run-hooks 'isearch-mode-end-hook)) | 821 (run-hooks 'isearch-mode-end-hook)) |
| 822 | 822 |
| 823 ;; If there was movement, mark the starting position. | 823 ;; If there was movement, mark the starting position. |
| 824 ;; Maybe should test difference between and set mark iff > threshold. | 824 ;; Maybe should test difference between and set mark only if > threshold. |
| 825 (if (/= (point) isearch-opoint) | 825 (if (/= (point) isearch-opoint) |
| 826 (or (and transient-mark-mode mark-active) | 826 (or (and transient-mark-mode mark-active) |
| 827 (progn | 827 (progn |
| 828 (push-mark isearch-opoint t) | 828 (push-mark isearch-opoint t) |
| 829 (or executing-kbd-macro (> (minibuffer-depth) 0) | 829 (or executing-kbd-macro (> (minibuffer-depth) 0) |
| 2323 ;; - the type of the current search is expected to be given by | 2323 ;; - the type of the current search is expected to be given by |
| 2324 ;; `isearch-word' and `isearch-regexp'; | 2324 ;; `isearch-word' and `isearch-regexp'; |
| 2325 ;; - the direction of the current search is expected to be given by | 2325 ;; - the direction of the current search is expected to be given by |
| 2326 ;; `isearch-forward'; | 2326 ;; `isearch-forward'; |
| 2327 ;; - the variable `isearch-error' is expected to be true | 2327 ;; - the variable `isearch-error' is expected to be true |
| 2328 ;; iff `isearch-string' is an invalid regexp. | 2328 ;; only if `isearch-string' is an invalid regexp. |
| 2329 | 2329 |
| 2330 (defvar isearch-lazy-highlight-overlays nil) | 2330 (defvar isearch-lazy-highlight-overlays nil) |
| 2331 (defvar isearch-lazy-highlight-wrapped nil) | 2331 (defvar isearch-lazy-highlight-wrapped nil) |
| 2332 (defvar isearch-lazy-highlight-start-limit nil) | 2332 (defvar isearch-lazy-highlight-start-limit nil) |
| 2333 (defvar isearch-lazy-highlight-end-limit nil) | 2333 (defvar isearch-lazy-highlight-end-limit nil) |