aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier <[email protected]>2010-09-18 00:09:58 +0200
committerStefan Monnier <[email protected]>2010-09-18 00:09:58 +0200
commit4be520fbecbb9c5518838effc54518ddf919351d (patch)
treeae4485a33f214680ff2a7463588fddf2491979cf
parent69e847be9279a21364638f38ac4376c6f2583590 (diff)
* lisp/isearch.el (isearch-face): Rename from `isearch'.
(isearch-highlight): Use new name.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/isearch.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd44a207ce..8edbfe8582 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-17 Stefan Monnier <[email protected]>
+
+ * isearch.el (isearch-face): Rename from `isearch'.
+ (isearch-highlight): Use new name.
+
2010-09-17 Eli Zaretskii <[email protected]>
* fringe.el (fringe-mode, fringe-query-style): Use 4 pixels, not
diff --git a/lisp/isearch.el b/lisp/isearch.el
index f18a74c59b..ea3476dca0 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -239,7 +239,7 @@ Default value, nil, means edit the string instead."
"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 @@ since they have special meaning in a regexp."
(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