[Emacs-diffs] /srv/bzr/emacs/trunk r101466: * lisp/isearch.el (isearch-face): Rename from `isearch'.

[Stefan Monnier]

------------------------------------------------------------
revno: 101466
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-18 00:09:58 +0200
message:
  * lisp/isearch.el (isearch-face): Rename from `isearch'.
  (isearch-highlight): Use new name.
modified:
  lisp/ChangeLog
  lisp/isearch.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-17 21:07:57 +0000
+++ b/lisp/ChangeLog    2010-09-17 22:09:58 +0000
@@ -1,3 +1,8 @@
+2010-09-17  Stefan Monnier  <address@hidden>
+
+       * isearch.el (isearch-face): Rename from `isearch'.
+       (isearch-highlight): Use new name.
+
 2010-09-17  Eli Zaretskii  <address@hidden>
 
        * fringe.el (fringe-mode, fringe-query-style): Use 4 pixels, not

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2010-08-29 16:17:13 +0000
+++ b/lisp/isearch.el   2010-09-17 22:09:58 +0000
@@ -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