[Emacs-diffs] emacs-25 44c7b49: In xref-collect-references, force backends to respect the 'dir' arg

[Stephen Leake]

branch: emacs-25
commit 44c7b49d9a8188e8befc85f7e95d074ad4605c6a
Author: Stephen Leake <address@hidden>
Commit: Stephen Leake <address@hidden>

    In xref-collect-references, force backends to respect the 'dir' arg
    
    * lisp/progmodes/xref.el (xref-collect-references): Force symref backends
    to use `default-directory'.
---
 lisp/progmodes/xref.el |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 2bccd85..d32da37 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -861,7 +861,13 @@ tools are used, and when."
   (cl-assert (directory-name-p dir))
   (require 'semantic/symref)
   (defvar semantic-symref-tool)
-  (let* ((default-directory dir)
+
+  ;; Some symref backends use `ede-project-root-directory' as the root
+  ;; directory for the search, rather than `default-directory'. Since
+  ;; the caller has specified `dir', we bind `ede-minor-mode' to nil
+  ;; to force the backend to use `default-directory'.
+  (let* ((ede-minor-mode nil)
+         (default-directory dir)
          (semantic-symref-tool 'detect)
          (res (semantic-symref-find-references-by-name symbol 'subdirs))
          (hits (and res (oref res hit-lines)))