aboutsummaryrefslogtreecommitdiffstats
path: root/src/xselect.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xselect.c')
-rw-r--r--src/xselect.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/xselect.c b/src/xselect.c
index 94a5584214f..9aaa10c6efa 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1915,7 +1915,7 @@ DEFUN ("x-own-selection-internal", Fx_own_selection_internal,
1915 Sx_own_selection_internal, 2, 3, 0, 1915 Sx_own_selection_internal, 2, 3, 0,
1916 doc: /* Assert an X selection of type SELECTION and value VALUE. 1916 doc: /* Assert an X selection of type SELECTION and value VALUE.
1917SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. 1917SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
1918\(Those are literal upper-case symbol names, since that's what X expects.) 1918(Those are literal upper-case symbol names, since that's what X expects.)
1919VALUE is typically a string, or a cons of two markers, but may be 1919VALUE is typically a string, or a cons of two markers, but may be
1920anything that the functions on `selection-converter-alist' know about. 1920anything that the functions on `selection-converter-alist' know about.
1921 1921
@@ -1944,7 +1944,7 @@ DEFUN ("x-get-selection-internal", Fx_get_selection_internal,
1944 Sx_get_selection_internal, 2, 4, 0, 1944 Sx_get_selection_internal, 2, 4, 0,
1945 doc: /* Return text selected from some X window. 1945 doc: /* Return text selected from some X window.
1946SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. 1946SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
1947\(Those are literal upper-case symbol names, since that's what X expects.) 1947(Those are literal upper-case symbol names, since that's what X expects.)
1948TARGET-TYPE is the type of data desired, typically `STRING'. 1948TARGET-TYPE is the type of data desired, typically `STRING'.
1949 1949
1950TIME-STAMP is the time to use in the XConvertSelection call for foreign 1950TIME-STAMP is the time to use in the XConvertSelection call for foreign
@@ -2048,7 +2048,7 @@ DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p,
2048 doc: /* Whether the current Emacs process owns the given X Selection. 2048 doc: /* Whether the current Emacs process owns the given X Selection.
2049The arg should be the name of the selection in question, typically one of 2049The arg should be the name of the selection in question, typically one of
2050the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. 2050the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
2051\(Those are literal upper-case symbol names, since that's what X expects.) 2051(Those are literal upper-case symbol names, since that's what X expects.)
2052For convenience, the symbol nil is the same as `PRIMARY', 2052For convenience, the symbol nil is the same as `PRIMARY',
2053and t is the same as `SECONDARY'. 2053and t is the same as `SECONDARY'.
2054 2054
@@ -2271,7 +2271,7 @@ x_fill_property_data (Display *dpy, Lisp_Object data, void *ret, int format)
2271 { 2271 {
2272 Lisp_Object o = XCAR (iter); 2272 Lisp_Object o = XCAR (iter);
2273 2273
2274 if (INTEGERP (o) || FLOATP (o) || CONSP (o)) 2274 if (NUMBERP (o) || CONSP (o))
2275 { 2275 {
2276 if (CONSP (o) 2276 if (CONSP (o)
2277 && RANGED_INTEGERP (X_LONG_MIN >> 16, XCAR (o), X_LONG_MAX >> 16) 2277 && RANGED_INTEGERP (X_LONG_MIN >> 16, XCAR (o), X_LONG_MAX >> 16)
@@ -2547,7 +2547,7 @@ x_send_client_event (Lisp_Object display, Lisp_Object dest, Lisp_Object from,
2547 else 2547 else
2548 error ("DEST as a string must be one of PointerWindow or InputFocus"); 2548 error ("DEST as a string must be one of PointerWindow or InputFocus");
2549 } 2549 }
2550 else if (INTEGERP (dest) || FLOATP (dest) || CONSP (dest)) 2550 else if (NUMBERP (dest) || CONSP (dest))
2551 CONS_TO_INTEGER (dest, Window, wdest); 2551 CONS_TO_INTEGER (dest, Window, wdest);
2552 else 2552 else
2553 error ("DEST must be a frame, nil, string, number or cons"); 2553 error ("DEST must be a frame, nil, string, number or cons");
@@ -2623,7 +2623,7 @@ and the local selection value (whatever was given to
2623`x-own-selection-internal'). 2623`x-own-selection-internal').
2624 2624
2625The function should return the value to send to the X server 2625The function should return the value to send to the X server
2626\(typically a string). A return value of nil 2626(typically a string). A return value of nil
2627means that the conversion could not be done. 2627means that the conversion could not be done.
2628A return value which is the symbol `NULL' 2628A return value which is the symbol `NULL'
2629means that a side-effect was executed, 2629means that a side-effect was executed,
@@ -2632,10 +2632,10 @@ and there is no meaningful selection value. */);
2632 2632
2633 DEFVAR_LISP ("x-lost-selection-functions", Vx_lost_selection_functions, 2633 DEFVAR_LISP ("x-lost-selection-functions", Vx_lost_selection_functions,
2634 doc: /* A list of functions to be called when Emacs loses an X selection. 2634 doc: /* A list of functions to be called when Emacs loses an X selection.
2635\(This happens when some other X client makes its own selection 2635(This happens when some other X client makes its own selection
2636or when a Lisp program explicitly clears the selection.) 2636or when a Lisp program explicitly clears the selection.)
2637The functions are called with one argument, the selection type 2637The functions are called with one argument, the selection type
2638\(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'). */); 2638(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'). */);
2639 Vx_lost_selection_functions = Qnil; 2639 Vx_lost_selection_functions = Qnil;
2640 2640
2641 DEFVAR_LISP ("x-sent-selection-functions", Vx_sent_selection_functions, 2641 DEFVAR_LISP ("x-sent-selection-functions", Vx_sent_selection_functions,