* lisp/progmodes/grep.el (grep-process-setup): Fix comments.

Fixes: debbugs:8084

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d30010d6016f4ae8f1912c23cfaa58d0615414f4..12b9ce29630633067c2e9a97a092f02a9be7ef0a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-05  Juri Linkov  <juri@jurta.org>
+
+       * progmodes/grep.el (grep-process-setup): Fix comments (bug#8084).
+
 2011-09-05  Juri Linkov  <juri@jurta.org>
 
        * progmodes/grep.el (grep-filter): Avoid incomplete processing by

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index eeebcc6648f6336841ec8f3b1f6f7ff710dce52d..8cb3c314faf7131fe0c61a9446afb8a34bdd2b2f 100644 (file)
--- 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")