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 639d8d9365277a109faee011ed8737c0bc697399..3240ee8a0db049e74d615ac2e0955c97944b3c6e 100644 (file)
--- 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