From d78e670237bc735e0804a91b3cb4fc962317ad8a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 15 Jul 2023 13:04:41 +0300 Subject: [PATCH 1/2] ; * src/lisp.h: Improve commentary for XIL, XLI, XLP (bug#64645). --- src/lisp.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lisp.h b/src/lisp.h index e8b9a795e3c..740e031e865 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -331,7 +331,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)) From 16f3a09e8dba33b2e3d7505862e7fc99952edcae Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 15 Jul 2023 22:08:52 +0300 Subject: [PATCH 2/2] ; * lisp/simple.el (kill-new): Fix a typo. (Bug#64423) --- lisp/simple.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/simple.el b/lisp/simple.el index 65af1d02a1e..86f65d9d98e 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -5624,7 +5624,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