master 3c0f863 2/4: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit 3c0f86312eda9a9afb91a3c3979fcc2b779eeb7b
Merge: 7a96025 8c27af3
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-27
    
    8c27af3ff4 Clarify how transient indentation modes are exited in the ...
    fc37dc298f Fix the previous change
---
 doc/emacs/indent.texi     | 4 ++--
 lisp/progmodes/project.el | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi
index df9e67f..d989f34 100644
--- a/doc/emacs/indent.texi
+++ b/doc/emacs/indent.texi
@@ -136,8 +136,8 @@ this transient mode is active, typing @kbd{@key{LEFT}} or
 @kbd{@key{RIGHT}} indents leftward and rightward, respectively, by one
 space.  You can also type @kbd{S-@key{LEFT}} or @kbd{S-@key{RIGHT}} to
 indent leftward or rightward to the next tab stop (@pxref{Tab Stops}).
-Typing any other key disables the transient mode, and resumes normal
-editing.
+Typing any other key disables the transient mode, and this key is then
+acted upon as normally.
 
 If called with a prefix argument @var{n}, this command indents the
 lines forward by @var{n} spaces (without enabling the transient mode).
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index abe563b..4c9b70c 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -725,7 +725,7 @@ requires quoting, e.g. `\\[quoted-insert]<space>'."
   (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)
@@ -757,7 +757,7 @@ 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 (cons
                              (project-root pr)