summaryrefslogtreecommitdiff
path: root/lisp/progmodes/xref.el
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2015-08-02 01:01:28 +0300
committerDmitry Gutov <dgutov@yandex.ru>2015-08-02 01:30:36 +0300
commit543bb9bc2023fafdadf697e23484214daac95dee (patch)
treec0abd684296a63de9e1366d1123575e330c001d6 /lisp/progmodes/xref.el
parent08d65696c947b09d4c32606f279c3c2594e99e16 (diff)
downloademacs-543bb9bc2023fafdadf697e23484214daac95dee.tar.gz
Add a second argument to project-ignores
* lisp/progmodes/project.el (project-ignores): Add a second argument DIR. * lisp/progmodes/project.el (project-ignores): Only include the VC ignores if DIR is the VC root. * lisp/progmodes/xref.el (xref-find-regexp): Update accordingly.
Diffstat (limited to 'lisp/progmodes/xref.el')
-rw-r--r--lisp/progmodes/xref.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 9764bc78b1a..27e56f2f94f 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -791,7 +791,8 @@ to search in, and the file name pattern to search for."
(lambda (_kind regexp)
(cl-mapcan
(lambda (dir)
- (xref-collect-matches regexp files dir (project-ignores proj)))
+ (xref-collect-matches regexp files dir
+ (project-ignores proj dir)))
dirs))))
(xref--show-xrefs regexp 'matches regexp nil)))