mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/replace.el (occur-engine): Use `add-face-text-property'

Browse source 
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
This commit is contained in:
Juri Linkov 2013-12-20 02:07:08 +02:00
parent 50ab1da6d6
commit 501158bcb9
3 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/hi-lock.el
View file

@ -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)