[Emacs-diffs] /srv/bzr/emacs/trunk r105660: * lisp/progmodes/grep.el (grep-process-setup): Fix comments.

[Juri Linkov]

------------------------------------------------------------
revno: 105660
fixes bug(s): http://debbugs.gnu.org/8084
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Mon 2011-09-05 12:48:26 +0300
message:
  * lisp/progmodes/grep.el (grep-process-setup): Fix comments.
modified:
  lisp/ChangeLog
  lisp/progmodes/grep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-05 08:20:02 +0000
+++ b/lisp/ChangeLog    2011-09-05 09:48:26 +0000
@@ -1,5 +1,9 @@
 2011-09-05  Juri Linkov  <address@hidden>
 
+       * progmodes/grep.el (grep-process-setup): Fix comments (bug#8084).
+
+2011-09-05  Juri Linkov  <address@hidden>
+
        * progmodes/grep.el (grep-filter): Avoid incomplete processing by
        keeping point where processing of grep matches begins, and
        continue to delete remaining escape sequences from the same point.

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2011-09-05 08:20:02 +0000
+++ b/lisp/progmodes/grep.el    2011-09-05 09:48:26 +0000
@@ -446,9 +446,10 @@
   (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")