# HG changeset patch # User Gerd Moellmann # Date 970514289 0 # Node ID ce5196c4aa6ff01af8b9ea5e5e044ab4e66d203f # Parent 14c5e673d8f1642164122afdfe2249f81fc265d9 (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'. diff -r 14c5e673d8f1 -r ce5196c4aa6f lisp/isearch.el --- a/lisp/isearch.el Mon Oct 02 17:44:51 2000 +0000 +++ b/lisp/isearch.el Mon Oct 02 19:18:09 2000 +0000 @@ -1735,9 +1735,7 @@ 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 @@ :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 @@ ;; 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))