mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-25 07:28:20 +00:00
Merge from origin/emacs-29
16f3a09e8d
; * lisp/simple.el (kill-new): Fix a typo. (Bug#64423)d78e670237
; * src/lisp.h: Improve commentary for XIL, XLI, XLP (bug...
This commit is contained in:
commit
c5fa58cbc4
@ -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
|
||||
|
@ -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))
|
||||
|
Loading…
Reference in New Issue
Block a user