diff options
| author | Eli Zaretskii | 2025-07-12 05:25:02 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2025-07-12 05:25:02 -0400 |
| commit | 4bff1dfe1f5cbf5922d136ebd261a73eaa1b55fb (patch) | |
| tree | 993d4e79910c4799d3590e5985cf1890cf79eca1 | |
| parent | 6729e314c2ab7a94eb1ae8bc54709813066058e6 (diff) | |
| parent | ebb65d41630786f1dac7727f9490d52d8f55e2f9 (diff) | |
| download | emacs-4bff1dfe1f5cbf5922d136ebd261a73eaa1b55fb.tar.gz emacs-4bff1dfe1f5cbf5922d136ebd261a73eaa1b55fb.zip | |
Merge from origin/emacs-30
ebb65d41630 ; Fix typos
| -rw-r--r-- | lisp/emacs-lisp/warnings.el | 2 | ||||
| -rw-r--r-- | lisp/replace.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el index 6f7ef9f5864..40fa98b24eb 100644 --- a/lisp/emacs-lisp/warnings.el +++ b/lisp/emacs-lisp/warnings.el | |||
| @@ -135,7 +135,7 @@ customizations. In particular, the category designated by the | |||
| 135 | symbol `warning' can be used in `display-buffer-alist' to customize | 135 | symbol `warning' can be used in `display-buffer-alist' to customize |
| 136 | the display of this buffer. | 136 | the display of this buffer. |
| 137 | 137 | ||
| 138 | This option affects display of all the buffers shown by `dispay-warning', | 138 | This option affects display of all the buffers shown by `display-warning', |
| 139 | including warnings from byte-compiler and native-compiler, | 139 | including warnings from byte-compiler and native-compiler, |
| 140 | from `check-declare', etc." | 140 | from `check-declare', etc." |
| 141 | :type 'boolean | 141 | :type 'boolean |
diff --git a/lisp/replace.el b/lisp/replace.el index 358f073c2c2..8227056e012 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -2461,7 +2461,7 @@ To be added to `context-menu-functions'." | |||
| 2461 | multi-buffer replacements) with no more questions, | 2461 | multi-buffer replacements) with no more questions, |
| 2462 | \\`N' (in multi-buffer replacements) to skip to the next buffer without | 2462 | \\`N' (in multi-buffer replacements) to skip to the next buffer without |
| 2463 | replacing remaining matches in the current buffer. | 2463 | replacing remaining matches in the current buffer. |
| 2464 | Any other character exits interactive replacement loop and is then | 2464 | Any other character exits the interactive replacement loop, and is then |
| 2465 | re-executed as a normal key sequence." | 2465 | re-executed as a normal key sequence." |
| 2466 | "Help message while in `query-replace'.") | 2466 | "Help message while in `query-replace'.") |
| 2467 | 2467 | ||