# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1284761398 -7200
# Node ID 1b38d71f516b0e7118d0dae8e109f5102ee38615
# Parent  c5508e3cbb4f165d5c34c1927113bbb66d797ee3
* lisp/isearch.el (isearch-face): Rename from `isearch'.
(isearch-highlight): Use new name.

diff -r c5508e3cbb4f -r 1b38d71f516b lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Sep 17 23:34:45 2010 +0200
+++ b/lisp/ChangeLog	Sat Sep 18 00:09:58 2010 +0200
@@ -1,3 +1,8 @@
+2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* isearch.el (isearch-face): Rename from `isearch'.
+	(isearch-highlight): Use new name.
+
 2010-09-17  Eli Zaretskii  <eliz@gnu.org>
 
 	* fringe.el (fringe-mode, fringe-query-style): Use 4 pixels, not
diff -r c5508e3cbb4f -r 1b38d71f516b lisp/isearch.el
--- a/lisp/isearch.el	Fri Sep 17 23:34:45 2010 +0200
+++ b/lisp/isearch.el	Sat Sep 18 00:09:58 2010 +0200
@@ -239,7 +239,7 @@
   "Face for highlighting Isearch matches."
   :group 'isearch
   :group 'basic-faces)
-(defvar isearch 'isearch)
+(defvar isearch-face 'isearch)
 
 (defface isearch-fail
   '((((class color) (min-colors 88) (background light))
@@ -2537,7 +2537,7 @@
 	(setq isearch-overlay (make-overlay beg end))
 	;; 1001 is higher than lazy's 1000 and ediff's 100+
 	(overlay-put isearch-overlay 'priority 1001)
-	(overlay-put isearch-overlay 'face isearch))))
+	(overlay-put isearch-overlay 'face isearch-face))))
 
 (defun isearch-dehighlight ()
   (when isearch-overlay