From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sun, 28 Jun 2015 01:38:11 +0000 (+0300)
Subject: Bind grep-highlight-matches around the rgrep call
X-Git-Tag: emacs-25.0.90~1623
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbf63ee00a3c263e3190320bc389bf0b72a5a9d5;p=emacs.git

Bind grep-highlight-matches around the rgrep call

* lisp/progmodes/grep.el (zrgrep): Bind grep-highlight-matches
around the rgrep call (bug#20728).
---

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 639d8d93652..3240ee8a0db 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1089,9 +1089,6 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'."
 	   (grep-find-template nil)
 	   (grep-find-command nil)
 	   (grep-host-defaults-alist nil)
-	   ;; Set `grep-highlight-matches' to `always'
-	   ;; since `zgrep' puts filters in the grep output.
-	   (grep-highlight-matches 'always)
 	   ;; Use for `grep-read-files'
 	   (grep-files-aliases '(("all" . "* .*")
 				 ("gz"  . "*.gz"))))
@@ -1109,7 +1106,10 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'."
 					    nil default-directory t))
 		  (confirm (equal current-prefix-arg '(4))))
 	     (list regexp files dir confirm grep-find-template)))))))
-  (let ((grep-find-template template))
+  (let ((grep-find-template template)
+        ;; Set `grep-highlight-matches' to `always'
+        ;; since `zgrep' puts filters in the grep output.
+        (grep-highlight-matches 'always))
     (rgrep regexp files dir confirm)))
 
 ;;;###autoload