From: Dmitry Gutov <dgutov@yandex.ru>
Date: Fri, 3 Feb 2017 01:10:30 +0000 (+0200)
Subject: (xref-collect-matches): Use '-E' together with '-e'
X-Git-Tag: emacs-26.0.90~858^2~18
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=604724e49d7b44dc663ad941998a0a44aa4fc178;p=emacs.git

(xref-collect-matches): Use '-E' together with '-e'

* lisp/progmodes/xref.el (xref-collect-matches): Use '-E'
together with '-e', as suggested by Noam Postavsky
(http://lists.gnu.org/archive/html/emacs-devel/2017-01/msg00780.html).
---

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index a507755d42e..a8933b0103e 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -918,11 +918,7 @@ IGNORES is a list of glob patterns."
   (grep-compute-defaults)
   (defvar grep-find-template)
   (defvar grep-highlight-matches)
-  ;; 'grep -E -foo' results in 'grep: oo: No such file or directory'.
-  ;; while 'grep -e -foo' inexplicably doesn't.
-  (when (eq (aref regexp 0) ?-)
-    (setq regexp (concat "\\" regexp)))
-  (let* ((grep-find-template (replace-regexp-in-string "-e " "-E "
+  (let* ((grep-find-template (replace-regexp-in-string "<C>" "<C> -E"
                                                        grep-find-template t t))
          (grep-highlight-matches nil)
          (command (xref--rgrep-command (xref--regexp-to-extended regexp)