master c5fa58cbc4a: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit c5fa58cbc4a33a0a65494b9ab2e35d4f30ab849b
Merge: f17bdee79b1 16f3a09e8db
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    16f3a09e8db ; * lisp/simple.el (kill-new): Fix a typo.  (Bug#64423)
    d78e670237b ; * src/lisp.h: Improve commentary for XIL, XLI, XLP (bug...
---
 lisp/simple.el | 2 +-
 src/lisp.h     | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lisp/simple.el b/lisp/simple.el
index 54e71e1b040..6dc08ff0eb0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5657,7 +5657,7 @@ argument should still be a \"useful\" string for such 
uses."
                   ;; interrupt this. If they interrupt it, we want to continue
                   ;; so we become selection owner, so this doesn't stay slow.
                   (if (eq (window-system) 'x)
-                      (ignore-error 'quit (funcall 
interprogram-paste-function))
+                      (ignore-error quit (funcall interprogram-paste-function))
                     (funcall interprogram-paste-function)))))
         (when interprogram-paste
           (setq interprogram-paste
diff --git a/src/lisp.h b/src/lisp.h
index 3fc78cd1919..2f4e6a00def 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -332,7 +332,14 @@ typedef EMACS_INT Lisp_Word;
    see these functions for commentary.  */
 
 /* Convert among the various Lisp-related types: I for EMACS_INT, L
-   for Lisp_Object, P for void *.  */
+   for Lisp_Object, P for void *.
+
+   These use the following mnemonics:
+
+   XLI: Lisp_Object to Integer;
+   XIL: Integer to Lisp_Object;
+   XLP: Lisp_Object to Pointer.  */
+
 #if !CHECK_LISP_OBJECT_TYPE
 # if LISP_WORDS_ARE_POINTERS
 #  define lisp_h_XLI(o) ((EMACS_INT) (o))