diff options
| author | Juri Linkov <juri@jurta.org> | 2013-12-20 02:07:08 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2013-12-20 02:07:08 +0200 |
| commit | 501158bcb9b5fb14e181aad75a9bb612a2cacff5 (patch) | |
| tree | bb843470e743fae203b41bb5e22f044b72a271d5 /lisp/hi-lock.el | |
| parent | 50ab1da6d67215219c4a26a045edcad28fa0b096 (diff) | |
| download | emacs-501158bcb9b5fb14e181aad75a9bb612a2cacff5.tar.gz | |
* lisp/replace.el (occur-engine): Use `add-face-text-property'
to add the face property to matches and titles.
* lisp/hi-lock.el (hi-green): Use lighter color "light green" closer to
the palette of other hi-lock colors.
(hi-lock-set-pattern): Prepend hi-lock face to the existing face.
Fixes: debbugs:14645
Diffstat (limited to 'lisp/hi-lock.el')
| -rw-r--r-- | lisp/hi-lock.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index d0a82cd97b0..37ca83cba31 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -164,9 +164,9 @@ When non-nil, each hi-lock command will cycle through faces in (defface hi-green '((((min-colors 88) (background dark)) - (:background "green1" :foreground "black")) + (:background "light green" :foreground "black")) (((background dark)) (:background "green" :foreground "black")) - (((min-colors 88)) (:background "green1")) + (((min-colors 88)) (:background "light green")) (t (:background "green"))) "Face for hi-lock mode." :group 'hi-lock-faces) @@ -715,7 +715,7 @@ Otherwise, read face name from minibuffer with completion and history." "Highlight REGEXP with face FACE." ;; Hashcons the regexp, so it can be passed to remove-overlays later. (setq regexp (hi-lock--hashcons regexp)) - (let ((pattern (list regexp (list 0 (list 'quote face) t)))) + (let ((pattern (list regexp (list 0 (list 'quote face) 'prepend)))) ;; Refuse to highlight a text that is already highlighted. (unless (assoc regexp hi-lock-interactive-patterns) (push pattern hi-lock-interactive-patterns) |