diff options
| author | Gerd Moellmann <[email protected]> | 2000-10-02 19:18:09 +0000 |
|---|---|---|
| committer | Gerd Moellmann <[email protected]> | 2000-10-02 19:18:09 +0000 |
| commit | 18ca20aa86d0588e8a39ac8fd3596476aab150c6 (patch) | |
| tree | 3750e4d4409e0c7055c8257743b7a3e72462effe /lisp/isearch.el | |
| parent | 944425c0c3bbee783b07c4fb5dc69a92c2c5355e (diff) | |
(isearch-faces): New custom group.
(isearch): New defface; was already tested for in the code.
(isearch-lazy-highlight-face): Changed to defface from defcustom.
(isearch-highlight): Always use face `isearch'.
Diffstat (limited to 'lisp/isearch.el')
| -rw-r--r-- | lisp/isearch.el | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index 1dd746b2b1..41b94cf998 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1735,9 +1735,7 @@ If there is no completion possible, say so and continue searching." nil (or isearch-overlay (setq isearch-overlay (make-overlay beg end))) (move-overlay isearch-overlay beg end (current-buffer)) - (overlay-put isearch-overlay 'face - (if (facep 'isearch) - 'isearch 'region)))) + (overlay-put isearch-overlay 'face isearch))) (defun isearch-dehighlight (totally) (if isearch-overlay @@ -1837,10 +1835,22 @@ If this is nil, extra highlighting can be \"manually\" removed with :type 'number :group 'isearch-lazy-highlight) -(defcustom isearch-lazy-highlight-face 'secondary-selection - "*Face to use for lazily highlighting all matches." - :type 'face - :group 'isearch-lazy-highlight) +(defgroup isearch-faces nil + "Lazy highlighting feature for incremental search." + :version "21.1" + :group 'isearch) + +(defface isearch + '((t (:inherit region))) + "Face for highlighting matches." + :group 'isearch-faces) +(defvar isearch 'isearch) + +(defface isearch-lazy-highlight-face + '((t (:inherit secondary-selection))) + "Face for lazy highlighting of matches." + :group 'isearch-faces) +(defvar isearch-lazy-highlight-face 'isearch-lazy-highlight-face) (defvar isearch-lazy-highlight-overlays nil) (defvar isearch-lazy-highlight-wrapped nil) @@ -1926,7 +1936,7 @@ Attempt to do the search exactly the way the pending isearch would." ;; found the next match (let ((ov (make-overlay (match-beginning 0) (match-end 0)))) - (overlay-put ov 'face isearch-lazy-highlight-face) + (overlay-put ov 'face 'isearch-lazy-highlight-face) (overlay-put ov 'priority 0) (setq isearch-lazy-highlight-overlays (cons ov isearch-lazy-highlight-overlays)) |