Merge from origin/emacs-30

ebb65d4163 ; Fix typos
This commit is contained in:
Eli Zaretskii 2025-07-12 05:25:02 -04:00
commit 4bff1dfe1f
2 changed files with 2 additions and 2 deletions

View file

@ -135,7 +135,7 @@ customizations. In particular, the category designated by the
symbol `warning' can be used in `display-buffer-alist' to customize
the display of this buffer.
This option affects display of all the buffers shown by `dispay-warning',
This option affects display of all the buffers shown by `display-warning',
including warnings from byte-compiler and native-compiler,
from `check-declare', etc."
:type 'boolean

View file

@ -2461,7 +2461,7 @@ To be added to `context-menu-functions'."
multi-buffer replacements) with no more questions,
\\`N' (in multi-buffer replacements) to skip to the next buffer without
replacing remaining matches in the current buffer.
Any other character exits interactive replacement loop and is then
Any other character exits the interactive replacement loop, and is then
re-executed as a normal key sequence."
"Help message while in `query-replace'.")