[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103485: grep.el fix for bug#8084.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103485: grep.el fix for bug#8084. |
Date: |
Wed, 02 Mar 2011 22:39:11 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103485
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-03-02 22:39:11 -0800
message:
grep.el fix for bug#8084.
* lisp/progmodes/grep.el (grep-highlight-matches): Doc fix.
(grep-process-setup): No highlighting without font-lock.
modified:
lisp/ChangeLog
lisp/progmodes/grep.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-03-03 06:25:21 +0000
+++ b/lisp/ChangeLog 2011-03-03 06:39:11 +0000
@@ -1,5 +1,8 @@
2011-03-03 Glenn Morris <address@hidden>
+ * progmodes/grep.el (grep-highlight-matches): Doc fix.
+ (grep-process-setup): No highlighting without font-lock. (Bug#8084)
+
* vc/vc-bzr.el (vc-bzr-state-heuristic): Handle dirstate entries
with no parents. (Bug#8025)
=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el 2011-02-10 19:13:31 +0000
+++ b/lisp/progmodes/grep.el 2011-03-03 06:39:11 +0000
@@ -72,7 +72,9 @@
Some grep programs are able to surround matches with special
markers in grep output. Such markers can be used to highlight
-matches in grep mode.
+matches in grep mode. This requires `font-lock-mode' to be active
+in grep buffers, so if you have globally disabled font-lock-mode,
+you will not get highlighting.
This option sets the environment variable GREP_COLORS to specify
markers for highlighting and GREP_OPTIONS to add the --color
@@ -462,6 +464,8 @@
(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))
;; `setenv' modifies `process-environment' let-bound in `compilation-start'
;; Any TERM except "dumb" allows GNU grep to use `--color=auto'
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103485: grep.el fix for bug#8084.,
Glenn Morris <=