diff options
| author | Pavel Janík | 2001-11-02 20:46:55 +0000 |
|---|---|---|
| committer | Pavel Janík | 2001-11-02 20:46:55 +0000 |
| commit | b78265036088d5d0eac2a03b929adb50aa59b45c (patch) | |
| tree | de99fe733144deb926fd31ee7bdff95cb1bc5073 /src/xselect.c | |
| parent | 00a2cef7d11a1b193891eb3d28274ef7fc7c3fe4 (diff) | |
| download | emacs-b78265036088d5d0eac2a03b929adb50aa59b45c.tar.gz emacs-b78265036088d5d0eac2a03b929adb50aa59b45c.zip | |
Update usage of CHECK_ macros (remove unused second argument).
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/xselect.c b/src/xselect.c index f2c1aa0a3e2..cc4eeed966e 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -304,7 +304,7 @@ x_own_selection (selection_name, selection_value) | |||
| 304 | struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (sf); | 304 | struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (sf); |
| 305 | int count; | 305 | int count; |
| 306 | 306 | ||
| 307 | CHECK_SYMBOL (selection_name, 0); | 307 | CHECK_SYMBOL (selection_name); |
| 308 | selection_atom = symbol_to_x_atom (dpyinfo, display, selection_name); | 308 | selection_atom = symbol_to_x_atom (dpyinfo, display, selection_name); |
| 309 | 309 | ||
| 310 | BLOCK_INPUT; | 310 | BLOCK_INPUT; |
| @@ -415,7 +415,7 @@ x_get_local_selection (selection_symbol, target_type) | |||
| 415 | count = specpdl_ptr - specpdl; | 415 | count = specpdl_ptr - specpdl; |
| 416 | specbind (Qinhibit_quit, Qt); | 416 | specbind (Qinhibit_quit, Qt); |
| 417 | 417 | ||
| 418 | CHECK_SYMBOL (target_type, 0); | 418 | CHECK_SYMBOL (target_type); |
| 419 | handler_fn = Fcdr (Fassq (target_type, Vselection_converter_alist)); | 419 | handler_fn = Fcdr (Fassq (target_type, Vselection_converter_alist)); |
| 420 | if (!NILP (handler_fn)) | 420 | if (!NILP (handler_fn)) |
| 421 | value = call3 (handler_fn, | 421 | value = call3 (handler_fn, |
| @@ -1173,12 +1173,12 @@ copy_multiple_data (obj) | |||
| 1173 | if (CONSP (obj)) | 1173 | if (CONSP (obj)) |
| 1174 | return Fcons (XCAR (obj), copy_multiple_data (XCDR (obj))); | 1174 | return Fcons (XCAR (obj), copy_multiple_data (XCDR (obj))); |
| 1175 | 1175 | ||
| 1176 | CHECK_VECTOR (obj, 0); | 1176 | CHECK_VECTOR (obj); |
| 1177 | vec = Fmake_vector (size = XVECTOR (obj)->size, Qnil); | 1177 | vec = Fmake_vector (size = XVECTOR (obj)->size, Qnil); |
| 1178 | for (i = 0; i < size; i++) | 1178 | for (i = 0; i < size; i++) |
| 1179 | { | 1179 | { |
| 1180 | Lisp_Object vec2 = XVECTOR (obj)->contents [i]; | 1180 | Lisp_Object vec2 = XVECTOR (obj)->contents [i]; |
| 1181 | CHECK_VECTOR (vec2, 0); | 1181 | CHECK_VECTOR (vec2); |
| 1182 | if (XVECTOR (vec2)->size != 2) | 1182 | if (XVECTOR (vec2)->size != 2) |
| 1183 | /* ??? Confusing error message */ | 1183 | /* ??? Confusing error message */ |
| 1184 | Fsignal (Qerror, Fcons (build_string ("vectors must be of length 2"), | 1184 | Fsignal (Qerror, Fcons (build_string ("vectors must be of length 2"), |
| @@ -1958,7 +1958,7 @@ anything that the functions on `selection-converter-alist' know about. */) | |||
| 1958 | Lisp_Object selection_name, selection_value; | 1958 | Lisp_Object selection_name, selection_value; |
| 1959 | { | 1959 | { |
| 1960 | check_x (); | 1960 | check_x (); |
| 1961 | CHECK_SYMBOL (selection_name, 0); | 1961 | CHECK_SYMBOL (selection_name); |
| 1962 | if (NILP (selection_value)) error ("selection-value may not be nil"); | 1962 | if (NILP (selection_value)) error ("selection-value may not be nil"); |
| 1963 | x_own_selection (selection_name, selection_value); | 1963 | x_own_selection (selection_name, selection_value); |
| 1964 | return selection_value; | 1964 | return selection_value; |
| @@ -1982,19 +1982,19 @@ TYPE is the type of data desired, typically `STRING'. */) | |||
| 1982 | struct gcpro gcpro1, gcpro2; | 1982 | struct gcpro gcpro1, gcpro2; |
| 1983 | GCPRO2 (target_type, val); /* we store newly consed data into these */ | 1983 | GCPRO2 (target_type, val); /* we store newly consed data into these */ |
| 1984 | check_x (); | 1984 | check_x (); |
| 1985 | CHECK_SYMBOL (selection_symbol, 0); | 1985 | CHECK_SYMBOL (selection_symbol); |
| 1986 | 1986 | ||
| 1987 | #if 0 /* #### MULTIPLE doesn't work yet */ | 1987 | #if 0 /* #### MULTIPLE doesn't work yet */ |
| 1988 | if (CONSP (target_type) | 1988 | if (CONSP (target_type) |
| 1989 | && XCAR (target_type) == QMULTIPLE) | 1989 | && XCAR (target_type) == QMULTIPLE) |
| 1990 | { | 1990 | { |
| 1991 | CHECK_VECTOR (XCDR (target_type), 0); | 1991 | CHECK_VECTOR (XCDR (target_type)); |
| 1992 | /* So we don't destructively modify this... */ | 1992 | /* So we don't destructively modify this... */ |
| 1993 | target_type = copy_multiple_data (target_type); | 1993 | target_type = copy_multiple_data (target_type); |
| 1994 | } | 1994 | } |
| 1995 | else | 1995 | else |
| 1996 | #endif | 1996 | #endif |
| 1997 | CHECK_SYMBOL (target_type, 0); | 1997 | CHECK_SYMBOL (target_type); |
| 1998 | 1998 | ||
| 1999 | val = x_get_local_selection (selection_symbol, target_type); | 1999 | val = x_get_local_selection (selection_symbol, target_type); |
| 2000 | 2000 | ||
| @@ -2035,7 +2035,7 @@ Disowning it means there is no such selection. */) | |||
| 2035 | check_x (); | 2035 | check_x (); |
| 2036 | display = FRAME_X_DISPLAY (sf); | 2036 | display = FRAME_X_DISPLAY (sf); |
| 2037 | dpyinfo = FRAME_X_DISPLAY_INFO (sf); | 2037 | dpyinfo = FRAME_X_DISPLAY_INFO (sf); |
| 2038 | CHECK_SYMBOL (selection, 0); | 2038 | CHECK_SYMBOL (selection); |
| 2039 | if (NILP (time)) | 2039 | if (NILP (time)) |
| 2040 | timestamp = last_event_timestamp; | 2040 | timestamp = last_event_timestamp; |
| 2041 | else | 2041 | else |
| @@ -2096,7 +2096,7 @@ and t is the same as `SECONDARY'. */) | |||
| 2096 | Lisp_Object selection; | 2096 | Lisp_Object selection; |
| 2097 | { | 2097 | { |
| 2098 | check_x (); | 2098 | check_x (); |
| 2099 | CHECK_SYMBOL (selection, 0); | 2099 | CHECK_SYMBOL (selection); |
| 2100 | if (EQ (selection, Qnil)) selection = QPRIMARY; | 2100 | if (EQ (selection, Qnil)) selection = QPRIMARY; |
| 2101 | if (EQ (selection, Qt)) selection = QSECONDARY; | 2101 | if (EQ (selection, Qt)) selection = QSECONDARY; |
| 2102 | 2102 | ||
| @@ -2126,7 +2126,7 @@ and t is the same as `SECONDARY'. */) | |||
| 2126 | return Qnil; | 2126 | return Qnil; |
| 2127 | 2127 | ||
| 2128 | dpy = FRAME_X_DISPLAY (sf); | 2128 | dpy = FRAME_X_DISPLAY (sf); |
| 2129 | CHECK_SYMBOL (selection, 0); | 2129 | CHECK_SYMBOL (selection); |
| 2130 | if (!NILP (Fx_selection_owner_p (selection))) | 2130 | if (!NILP (Fx_selection_owner_p (selection))) |
| 2131 | return Qt; | 2131 | return Qt; |
| 2132 | if (EQ (selection, Qnil)) selection = QPRIMARY; | 2132 | if (EQ (selection, Qnil)) selection = QPRIMARY; |
| @@ -2166,8 +2166,8 @@ initialize_cut_buffers (display, window) | |||
| 2166 | } | 2166 | } |
| 2167 | 2167 | ||
| 2168 | 2168 | ||
| 2169 | #define CHECK_CUT_BUFFER(symbol,n) \ | 2169 | #define CHECK_CUT_BUFFER(symbol) \ |
| 2170 | { CHECK_SYMBOL ((symbol), (n)); \ | 2170 | { CHECK_SYMBOL ((symbol)); \ |
| 2171 | if (!EQ((symbol), QCUT_BUFFER0) && !EQ((symbol), QCUT_BUFFER1) \ | 2171 | if (!EQ((symbol), QCUT_BUFFER0) && !EQ((symbol), QCUT_BUFFER1) \ |
| 2172 | && !EQ((symbol), QCUT_BUFFER2) && !EQ((symbol), QCUT_BUFFER3) \ | 2172 | && !EQ((symbol), QCUT_BUFFER2) && !EQ((symbol), QCUT_BUFFER3) \ |
| 2173 | && !EQ((symbol), QCUT_BUFFER4) && !EQ((symbol), QCUT_BUFFER5) \ | 2173 | && !EQ((symbol), QCUT_BUFFER4) && !EQ((symbol), QCUT_BUFFER5) \ |
| @@ -2199,7 +2199,7 @@ DEFUN ("x-get-cut-buffer-internal", Fx_get_cut_buffer_internal, | |||
| 2199 | display = FRAME_X_DISPLAY (sf); | 2199 | display = FRAME_X_DISPLAY (sf); |
| 2200 | dpyinfo = FRAME_X_DISPLAY_INFO (sf); | 2200 | dpyinfo = FRAME_X_DISPLAY_INFO (sf); |
| 2201 | window = RootWindow (display, 0); /* Cut buffers are on screen 0 */ | 2201 | window = RootWindow (display, 0); /* Cut buffers are on screen 0 */ |
| 2202 | CHECK_CUT_BUFFER (buffer, 0); | 2202 | CHECK_CUT_BUFFER (buffer); |
| 2203 | buffer_atom = symbol_to_x_atom (dpyinfo, display, buffer); | 2203 | buffer_atom = symbol_to_x_atom (dpyinfo, display, buffer); |
| 2204 | 2204 | ||
| 2205 | x_get_window_property (display, window, buffer_atom, &data, &bytes, | 2205 | x_get_window_property (display, window, buffer_atom, &data, &bytes, |
| @@ -2244,8 +2244,8 @@ DEFUN ("x-store-cut-buffer-internal", Fx_store_cut_buffer_internal, | |||
| 2244 | if (max_bytes > MAX_SELECTION_QUANTUM) | 2244 | if (max_bytes > MAX_SELECTION_QUANTUM) |
| 2245 | max_bytes = MAX_SELECTION_QUANTUM; | 2245 | max_bytes = MAX_SELECTION_QUANTUM; |
| 2246 | 2246 | ||
| 2247 | CHECK_CUT_BUFFER (buffer, 0); | 2247 | CHECK_CUT_BUFFER (buffer); |
| 2248 | CHECK_STRING (string, 0); | 2248 | CHECK_STRING (string); |
| 2249 | buffer_atom = symbol_to_x_atom (FRAME_X_DISPLAY_INFO (sf), | 2249 | buffer_atom = symbol_to_x_atom (FRAME_X_DISPLAY_INFO (sf), |
| 2250 | display, buffer); | 2250 | display, buffer); |
| 2251 | data = (unsigned char *) XSTRING (string)->data; | 2251 | data = (unsigned char *) XSTRING (string)->data; |
| @@ -2297,7 +2297,7 @@ Positive means shift the values forward, negative means backward. */) | |||
| 2297 | check_x (); | 2297 | check_x (); |
| 2298 | display = FRAME_X_DISPLAY (sf); | 2298 | display = FRAME_X_DISPLAY (sf); |
| 2299 | window = RootWindow (display, 0); /* Cut buffers are on screen 0 */ | 2299 | window = RootWindow (display, 0); /* Cut buffers are on screen 0 */ |
| 2300 | CHECK_NUMBER (n, 0); | 2300 | CHECK_NUMBER (n); |
| 2301 | if (XINT (n) == 0) | 2301 | if (XINT (n) == 0) |
| 2302 | return n; | 2302 | return n; |
| 2303 | if (! FRAME_X_DISPLAY_INFO (sf)->cut_buffers_initialized) | 2303 | if (! FRAME_X_DISPLAY_INFO (sf)->cut_buffers_initialized) |