andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-27

Browse source 
8c27af3ff4 Clarify how transient indentation modes are exited in the ...
fc37dc298f Fix the previous change
This commit is contained in:
Glenn Morris 2021-02-06 08:05:29 -08:00
commit 3c0f86312e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/emacs/indent.texi
View file

@ -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).

4
lisp/progmodes/project.el
View file

@ -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)