diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/isearch.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cd44a207ce2..8edbfe85823 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/isearch.el b/lisp/isearch.el index f18a74c59b5..ea3476dca06 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 |