aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2013-02-02 02:35:38 +0200
committerJuri Linkov2013-02-02 02:35:38 +0200
commit98da8c0f542465341b930d36db8000b5bb2c77c4 (patch)
treed81deea1a504d424b1221f9153fc19d166e99afd
parent35e854998e2ab2155875683411beb0518236da18 (diff)
downloademacs-98da8c0f542465341b930d36db8000b5bb2c77c4.tar.gz
emacs-98da8c0f542465341b930d36db8000b5bb2c77c4.zip
* lisp/progmodes/grep.el (grep-regexp-alist): Use variable grep-match-face
instead of hard-coded default face `match'. (Bug#9438)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/grep.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fba2817b1e..d27b2a44c15 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-02-02 Juri Linkov <juri@jurta.org>
2
3 * progmodes/grep.el (grep-regexp-alist): Use variable grep-match-face
4 instead of hard-coded default face `match'. (Bug#9438)
5
12012-02-01 Christopher Schmidt <christopher@ch.ristopher.com> 62012-02-01 Christopher Schmidt <christopher@ch.ristopher.com>
2 7
3 * vc/vc-arch.el (vc-arch-registered): 8 * vc/vc-arch.el (vc-arch-registered):
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index ef321addf24..d8c39f2ddef 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -359,7 +359,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
359 (when grep-highlight-matches 359 (when grep-highlight-matches
360 (let* ((beg (match-end 0)) 360 (let* ((beg (match-end 0))
361 (end (save-excursion (goto-char beg) (line-end-position))) 361 (end (save-excursion (goto-char beg) (line-end-position)))
362 (mbeg (text-property-any beg end 'font-lock-face 'match))) 362 (mbeg (text-property-any beg end 'font-lock-face grep-match-face)))
363 (when mbeg 363 (when mbeg
364 (- mbeg beg))))) 364 (- mbeg beg)))))
365 . 365 .
@@ -367,7 +367,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
367 (when grep-highlight-matches 367 (when grep-highlight-matches
368 (let* ((beg (match-end 0)) 368 (let* ((beg (match-end 0))
369 (end (save-excursion (goto-char beg) (line-end-position))) 369 (end (save-excursion (goto-char beg) (line-end-position)))
370 (mbeg (text-property-any beg end 'font-lock-face 'match)) 370 (mbeg (text-property-any beg end 'font-lock-face grep-match-face))
371 (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end)))) 371 (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end))))
372 (when mend 372 (when mend
373 (- mend beg))))))) 373 (- mend beg)))))))