Mercurial > emacs
comparison lisp/isearch.el @ 67425:98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
(isearch-lazy-highlight-update): Change lazy overlay priority from 0 to 1000.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Fri, 09 Dec 2005 09:45:06 +0000 |
| parents | 25a39a23b428 |
| children | e6b4f7137699 |
comparison
equal
deleted
inserted
replaced
| 67424:02c3cfe8d00b | 67425:98dba3ad8a8a |
|---|---|
| 2233 ;; Highlighting | 2233 ;; Highlighting |
| 2234 | 2234 |
| 2235 (defvar isearch-overlay nil) | 2235 (defvar isearch-overlay nil) |
| 2236 | 2236 |
| 2237 (defun isearch-highlight (beg end) | 2237 (defun isearch-highlight (beg end) |
| 2238 (unless (null search-highlight) | 2238 (if search-highlight |
| 2239 (cond (isearch-overlay | 2239 (if isearch-overlay |
| 2240 ;; Overlay already exists, just move it. | 2240 ;; Overlay already exists, just move it. |
| 2241 (move-overlay isearch-overlay beg end (current-buffer))) | 2241 (move-overlay isearch-overlay beg end (current-buffer)) |
| 2242 | 2242 ;; Overlay doesn't exist, create it. |
| 2243 (t | 2243 (setq isearch-overlay (make-overlay beg end)) |
| 2244 ;; Overlay doesn't exist, create it. | 2244 ;; 1001 is higher than lazy's 1000 and ediff's 100+ |
| 2245 (setq isearch-overlay (make-overlay beg end)) | 2245 (overlay-put isearch-overlay 'priority 1001) |
| 2246 (overlay-put isearch-overlay 'face isearch) | 2246 (overlay-put isearch-overlay 'face isearch)))) |
| 2247 (overlay-put isearch-overlay 'priority 1) ;higher than lazy overlays | |
| 2248 )))) | |
| 2249 | 2247 |
| 2250 (defun isearch-dehighlight () | 2248 (defun isearch-dehighlight () |
| 2251 (when isearch-overlay | 2249 (when isearch-overlay |
| 2252 (delete-overlay isearch-overlay))) | 2250 (delete-overlay isearch-overlay))) |
| 2253 | 2251 |
| 2407 (forward-char -1))) | 2405 (forward-char -1))) |
| 2408 | 2406 |
| 2409 ;; non-zero-length match | 2407 ;; non-zero-length match |
| 2410 (let ((ov (make-overlay mb me))) | 2408 (let ((ov (make-overlay mb me))) |
| 2411 (push ov isearch-lazy-highlight-overlays) | 2409 (push ov isearch-lazy-highlight-overlays) |
| 2410 ;; 1000 is higher than ediff's 100+, | |
| 2411 ;; but lower than isearch main overlay's 1001 | |
| 2412 (overlay-put ov 'priority 1000) | |
| 2412 (overlay-put ov 'face lazy-highlight-face) | 2413 (overlay-put ov 'face lazy-highlight-face) |
| 2413 (overlay-put ov 'priority 0) ;lower than main overlay | |
| 2414 (overlay-put ov 'window (selected-window)))) | 2414 (overlay-put ov 'window (selected-window)))) |
| 2415 (if isearch-forward | 2415 (if isearch-forward |
| 2416 (setq isearch-lazy-highlight-end (point)) | 2416 (setq isearch-lazy-highlight-end (point)) |
| 2417 (setq isearch-lazy-highlight-start (point))))) | 2417 (setq isearch-lazy-highlight-start (point))))) |
| 2418 | 2418 |