summaryrefslogtreecommitdiff
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2021-02-06 08:05:29 -0800
committerGlenn Morris <rgm@gnu.org>2021-02-06 08:05:29 -0800
commit3c0f86312eda9a9afb91a3c3979fcc2b779eeb7b (patch)
treed4eb2279af348b28542fddf6229b34f46f422367 /lisp/progmodes
parent7a960251b3f836254aee83977dffca2540e091db (diff)
parent8c27af3ff465fe78c635a8acd1debc9c63bfa7f3 (diff)
downloademacs-3c0f86312eda9a9afb91a3c3979fcc2b779eeb7b.tar.gz
emacs-3c0f86312eda9a9afb91a3c3979fcc2b779eeb7b.tar.bz2
emacs-3c0f86312eda9a9afb91a3c3979fcc2b779eeb7b.zip
Merge from origin/emacs-27
8c27af3ff4 Clarify how transient indentation modes are exited in the ... fc37dc298f Fix the previous change
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/project.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index abe563bec04..4c9b70ce043 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)