From: Dmitry Gutov <dgutov@yandex.ru>
Date: Wed, 3 Jun 2015 23:46:16 +0000 (+0300)
Subject: Override 'grep --color=always'
X-Git-Tag: emacs-25.0.90~1878
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/6d020ecd8951244296ebefc04d15eb10781bb846

Override 'grep --color=always'

* lisp/progmodes/xref.el (xref-collect-matches):
Override --color=always in grep-find-template.
---

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index f786d4e3ac..89a9cf5d5e 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -749,8 +749,13 @@ tools are used, and when."
   (require 'semantic/fw)
   (grep-compute-defaults)
   (defvar grep-find-template)
-  (let* ((grep-find-template (replace-regexp-in-string "-e " "-E "
-                                                       grep-find-template t t))
+  (let* ((grep-find-template
+          (replace-regexp-in-string
+           ;; Override the use ot '--color=always' on MS-Windows.
+           "--color=always" ""
+           (replace-regexp-in-string "-e " "-E "
+                                     grep-find-template t t)
+           t t))
          (command (rgrep-default-command (xref--regexp-to-extended regexp)
                                          "*.*" dir))
          (orig-buffers (buffer-list))