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

Merge from origin/emacs-30

Browse source 
4745456677 ; * lisp/dired-x.el (dired-find-subdir): Doc fix (bug#794...
0832e5fec5 ; * lisp/vc/vc.el (vc-print-root-log): Improve docstring ...
2fafcdbf6a ; Minor copyedits in src/editfns.c
This commit is contained in:
Eli Zaretskii 2025-09-13 07:23:12 -04:00
commit 125b3588c9
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/dired-x.el
View file

@ -188,16 +188,14 @@ When nil, don't show messages."
:group 'dired-x)
(defcustom dired-find-subdir nil ; t is pretty near to DWIM...
"If non-nil, Dired always finds a directory in a buffer of its own.
If nil, Dired finds the directory as a subdirectory in some other buffer
if it is present as one.
"If nil, Dired always finds a directory in a buffer of its own.
If non-nil, Dired finds the directory as a subdirectory in some
other buffer if it is present as one.
If there are several Dired buffers for a directory, the most recently
used is chosen.
Dired avoids switching to the current buffer, so that if you have
a normal and a wildcard buffer for the same directory, \\[dired] will
toggle between those two."
If the value is non-nil, and there are several Dired buffers for a
directory, the most recently used is chosen. Dired avoids switching
to the current buffer, so that if you have a normal and a wildcard
buffer for the same directory, \\[dired] will toggle between those two."
:type 'boolean
:group 'dired-x)

2
lisp/vc/vc.el
View file

@ -3515,7 +3515,7 @@ number of revisions to show; the default is `vc-log-show-limit'.
When called interactively with a prefix argument, prompt for LIMIT, but
if the prefix argument is a number, use it as LIMIT.
A special case is when the prefix argument is 1: in this case
the command prompts for the ID of a revision, and shows that revision
the command prompts for the id of a REVISION, and shows that revision
with its diffs (if the underlying VCS backend supports that)."
(interactive
(cond

6
src/editfns.c
View file

@ -1693,7 +1693,7 @@ If narrowing is in effect, this function returns only the visible part
of the buffer.
This function copies the text properties of that part of the buffer
into the result string; if you don’t want the text properties,
into the result string; if you don't want the text properties,
use `buffer-substring-no-properties' instead. */)
(void)
{
@ -2151,7 +2151,7 @@ a buffer or a string. But this is deprecated. */)
Lisp_Object src = CALLN (Fvector, source_buffer, Qnil, Qnil);
/* Walk backwards through the lists of changes. This was also
cargo-culted from src/analyze.c in GNU Diffutils. Because we
walk backwards, we don’t have to keep the positions in sync. */
walk backwards, we don't have to keep the positions in sync. */
while (i >= 0 || j >= 0)
{
rarely_quit (++ctx.quitcounter);
@ -3426,7 +3426,7 @@ usage: (format-message STRING &rest OBJECTS) */)
return styled_format (nargs, args, true);
}
/* Implement ‘format-message’ if MESSAGE is true, ‘format’ otherwise. */
/* Implement `format-message' if MESSAGE is true, `format' otherwise. */
static Lisp_Object
styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)