From: Glenn Morris <rgm@gnu.org>
Date: Sat, 6 Feb 2021 16:05:29 +0000 (-0800)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~3908
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c0f86312eda9a9afb91a3c3979fcc2b779eeb7b;p=emacs.git

Merge from origin/emacs-27

8c27af3ff4 Clarify how transient indentation modes are exited in the ...
fc37dc298f Fix the previous change
---

3c0f86312eda9a9afb91a3c3979fcc2b779eeb7b
diff --cc lisp/progmodes/project.el
index abe563bec04,ca0755cf8cd..4c9b70ce043
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@@ -725,10 -441,10 +725,10 @@@ requires quoting, e.g. `\\[quoted-inser
    (require 'xref)
    (require 'grep)
    (let* ((pr (project-current t))
-          (default-directory (project-root pr))
+          (default-directory (car (project-roots pr)))
           (files
            (if (not current-prefix-arg)
 -              (project-files pr (project-roots pr))
 +              (project-files pr)
              (let ((dir (read-directory-name "Base directory: "
                                              nil default-directory t)))
                (project--files-in-directory dir
@@@ -757,10 -474,10 +757,10 @@@ pattern to search for.
    (interactive (list (project--read-regexp)))
    (require 'xref)
    (let* ((pr (project-current t))
-          (default-directory (project-root pr))
+          (default-directory (car (project-roots pr)))
           (files
 -          (project-files pr (append
 -                             (project-roots pr)
 +          (project-files pr (cons
 +                             (project-root pr)
                               (project-external-roots pr)))))
      (xref--show-xrefs
       (apply-partially #'project--find-regexp-in-files regexp files)