summaryrefslogtreecommitdiff
path: root/lisp/progmodes/grep.el
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2011-09-05 12:48:26 +0300
committerJuri Linkov <juri@jurta.org>2011-09-05 12:48:26 +0300
commit904399061f928283c863953b55dade3ee21c9d49 (patch)
treec4e00299bd8837d6c82dede11edb8169ee75ea40 /lisp/progmodes/grep.el
parentecfc0a490102d59a6b66a85f12639769a233e4fb (diff)
downloademacs-904399061f928283c863953b55dade3ee21c9d49.tar.gz
* lisp/progmodes/grep.el (grep-process-setup): Fix comments.
Fixes: debbugs:8084
Diffstat (limited to 'lisp/progmodes/grep.el')
-rw-r--r--lisp/progmodes/grep.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index eeebcc6648f..8cb3c314faf 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -446,9 +446,10 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
(when (eq grep-highlight-matches 'auto-detect)
(grep-compute-defaults))
(unless (or (eq grep-highlight-matches 'auto-detect)
- ;; Uses font-lock to parse color escapes. (Bug#8084)
- (null font-lock-mode)
- (null grep-highlight-matches))
+ (null grep-highlight-matches)
+ ;; Don't output color escapes if they can't be
+ ;; highlighted with `font-lock-face' by `grep-filter'.
+ (null font-lock-mode))
;; `setenv' modifies `process-environment' let-bound in `compilation-start'
;; Any TERM except "dumb" allows GNU grep to use `--color=auto'
(setenv "TERM" "emacs-grep")