master f99de40efc0 3/9: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit f99de40efc022da46bac3faf168ca2d23e41e286
Merge: 457b5e23fa1 32a32853ce9
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    32a32853ce9 Typofix in the doc/lispref/modes.texi
    f98637b51b5 ; Fix 'add-face-text-property' shortdoc
    3fff22eb20c Fix spell-checking email message with citations
---
 doc/lispref/modes.texi      | 2 +-
 lisp/emacs-lisp/shortdoc.el | 2 +-
 lisp/textmodes/ispell.el    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 130bc10cd59..8670807cbdf 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -2692,7 +2692,7 @@ display in pixels, by multiplying the value of this 
variable by the
 value returned by @code{frame-char-width} (@pxref{Frame Font}), and
 then use the result to align header-line text using the
 @code{:align-to} display property spec (@pxref{Specified Space}) in
-pixels on the relevant parts of @code{header-line-frormat}.
+pixels on the relevant parts of @code{header-line-format}.
 @end defvar
 
 @defun window-header-line-height &optional window
diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el
index dbc061d8a70..1fa798beae1 100644
--- a/lisp/emacs-lisp/shortdoc.el
+++ b/lisp/emacs-lisp/shortdoc.el
@@ -1388,7 +1388,7 @@ A FUNC form can have any number of `:no-eval' (or 
`:no-value'),
   (set-text-properties
    :no-eval (set-text-properties (point) (1+ (point)) '(face error)))
   (add-face-text-property
-   (add-face-text-property START END '(:foreground "green")))
+   :no-eval (add-face-text-property START END '(:foreground "green")))
   (propertize
    :eval (propertize "foo" 'face 'italic 'mouse-face 'bold-italic))
   "Searching for Text Properties"
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 9bd1135c5be..b71e85b0e37 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -3974,7 +3974,8 @@ You can bind this to the key C-c i in GNUS or mail by 
adding to
                       (point-max)))
                    (t (min (point-max) (funcall ispell-message-text-end))))))
           (default-prefix   ; Vanilla cite prefix (just used for cite-regexp)
-            (if (ispell-non-empty-string mail-yank-prefix)
+            (if mail-yank-prefix
+                 (ispell-non-empty-string mail-yank-prefix)
               "   \\|\t"))
           (cite-regexp                 ;Prefix of quoted text
            (cond