diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2024-03-16 05:47:41 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2024-03-16 05:47:41 -0400 |
| commit | cc8a2c57b5eed4045035dfeaf129ce33d7f74733 (patch) | |
| tree | 793edac12eec2ecc8539441e152e7b33fad9ab78 /doc | |
| parent | 899ea79310d1b8ed78c3fd8ac1784043dd732dbf (diff) | |
| parent | 3b791ebbe173fa18515558acaafbef1f88c51791 (diff) | |
| download | emacs-cc8a2c57b5eed4045035dfeaf129ce33d7f74733.tar.gz | |
Merge from origin/emacs-29
3b791ebbe17 ; Fix 'usage:' keyword in Ffile_name_concat doc.
ed48b0d657c ; * CONTRIBUTE: Ask not to use non-ASCII unless necessary.
b708e639d63 ; * src/lread.c (maybe_swap_for_eln): Clarify warning mes...
db027a06976 ; Fix bibtex-biblatex-field-alist docstring typo.
a9be5c7ea92 ; * doc/lispref/control.texi (Conditionals): Add missing ...
db5915f30ba Fix 'with-sqlite-transaction'
fe491173e8f ; * doc/emacs/files.texi (Image Mode): Fix typo (bug#69671).
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/files.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/control.texi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index b152b7943a2..7f514a1c8b7 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -2392,7 +2392,7 @@ multiply the size by the factor of @w{@code{1 + @var{n} / 10}}, so @findex image-decrease-size @kindex i - (Image mode) @item i - -Decrease the image size (@code{image-increase-size}) by 20%. Prefix +Decrease the image size (@code{image-decrease-size}) by 20%. Prefix numeric argument controls the decrement; the value of @var{n} means to multiply the size by the factor of @w{@code{1 - @var{n} / 10}}, so @w{@kbd{C-u 3 i -}} means to decrease the size by 30%. diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index 78ad5b68a51..f9f3389c398 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -323,7 +323,7 @@ described below. @defmac if-let spec then-form else-forms... Evaluate each binding in @var{spec} in turn, like in @code{let*} -(@pxref{Local Variables}, stopping if a binding value is @code{nil}. +(@pxref{Local Variables}), stopping if a binding value is @code{nil}. If all are non-@code{nil}, return the value of @var{then-form}, otherwise the last form in @var{else-forms}. @end defmac |