procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

grep.el fix for bug#8084.

Browse source 
* lisp/progmodes/grep.el (grep-highlight-matches): Doc fix.
(grep-process-setup): No highlighting without font-lock.
This commit is contained in:
Glenn Morris 2011-03-02 22:39:11 -08:00
parent f96dc50fc0
commit a915d7a1e5
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2011-03-03 Glenn Morris <rgm@gnu.org>
* 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)

6
lisp/progmodes/grep.el
View file

@ -72,7 +72,9 @@ SYMBOL should be one of `grep-command', `grep-template',
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 @@ 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))
;; `setenv' modifies `process-environment' let-bound in `compilation-start'
;; Any TERM except "dumb" allows GNU grep to use `--color=auto'