(query-replace-lazy-highlight): Add lazy-highlight group.

(query-replace-highlight, query-replace-lazy-highlight)
(query-replace): Move definitions to the beginning of the file.

2 files changed, 39 insertions, 21 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d8e6518c56..96d8bcc5b06 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2005-01-12  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (search-highlight, isearch, isearch-lazy-highlight):
+        Bring together isearch highlight related options.
+        (lazy-highlight): Replace group `replace' by `matching'.
+        (lazy-highlight-cleanup, lazy-highlight-initial-delay)
+        (lazy-highlight-interval, lazy-highlight-max-at-a-time)
+        (lazy-highlight): Add aliases to old names isearch-lazy-highlight-...
+        and declare them obsolete.
+        (lazy-highlight-face): Rename from isearch-lazy-highlight-face.
+        (isearch-faces): Remove defgroup.
+        (isearch-overlay, isearch-highlight, isearch-dehighlight):
+        Move isearch highlighting code closer to lazy highlighting code.
+
+        * replace.el (query-replace-lazy-highlight): Add lazy-highlight group.
+        (query-replace-highlight, query-replace-lazy-highlight)
+        (query-replace): Move definitions to the beginning of the file.
+
 2005-01-11  Juri Linkov  <juri@jurta.org>
 
         * toolbar/back_arrow.xpm, toolbar/back_arrow.pbm,
diff --git a/lisp/replace.el b/lisp/replace.el
index 33a30aa92d9..3520f3e2268 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -64,6 +64,27 @@ strings or patterns."
   :group 'matching
   :version "21.4")
 
+(defcustom query-replace-highlight t
+  "*Non-nil means to highlight matches during query replacement."
+  :type 'boolean
+  :group 'matching)
+
+(defcustom query-replace-lazy-highlight t
+  "*Controls the lazy-highlighting during query replacements.
+When non-nil, all text in the buffer matching the current match
+is highlighted lazily using isearch lazy highlighting (see
+`lazy-highlight-initial-delay' and `lazy-highlight-interval')."
+  :type 'boolean
+  :group 'lazy-highlight
+  :group 'matching
+  :version "21.4")
+
+(defface query-replace
+  '((t (:inherit isearch)))
+  "Face for highlighting query replacement matches."
+  :group 'matching
+  :version "21.4")
+
 (defun query-replace-descr (string)
   (mapconcat 'isearch-text-char-description string ""))
 
@@ -1258,27 +1279,6 @@ passed in.  If LITERAL is set, no checking is done, anyway."
   (replace-match newtext fixedcase literal)
   noedit)
 
-(defcustom query-replace-highlight t
-  "*Non-nil means to highlight matches during query replacement."
-  :type 'boolean
-  :group 'matching)
-
-(defcustom query-replace-lazy-highlight t
-  "*Controls the lazy-highlighting during query replacements.
-When non-nil, all text in the buffer matching the current match
-is highlighted lazily using isearch lazy highlighting (see
-`lazy-highlight-initial-delay' and
-`lazy-highlight-interval')."
-  :type 'boolean
-  :group 'matching
-  :version "21.4")
-
-(defface query-replace
-  '((t (:inherit isearch)))
-  "Face for highlighting query replacement matches."
-  :group 'matching
-  :version "21.4")
-
 (defun perform-replace (from-string replacements
                         query-flag regexp-flag delimited-flag
                         &optional repeat-count map start end)