diff options
| author | Paul Eggert | 2014-07-07 16:33:05 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-07-07 16:33:05 -0700 |
| commit | cae17e36bc98cbcf5aa54d90396de1fe1d7b5c77 (patch) | |
| tree | 12f28771f8d62c14c5f0281916aaecf02c152f6f /src/xselect.c | |
| parent | 0e14232948f875e390ed46348969b9ebeb9133c1 (diff) | |
| download | emacs-cae17e36bc98cbcf5aa54d90396de1fe1d7b5c77.tar.gz emacs-cae17e36bc98cbcf5aa54d90396de1fe1d7b5c77.zip | |
Minor fixups related to usage of the 'long' type.
* gnutls.c (emacs_gnutls_handshake):
* xfaces.c (dump_realized_face):
Work even if 'long' is narrower than 'void *'.
* termcap.c (scan_file):
* xselect.c (x_decline_selection_request)
(x_reply_selection_request, x_get_window_property):
* xterm.c (x_set_frame_alpha):
Remove unnecessary 'L' suffixes of integer constants.
* xfns.c (hack_wm_protocols):
* xselect.c (x_fill_property_data):
* xterm.c (x_set_offset, x_set_window_size_1, x_make_frame_invisible):
Remove unnecessary casts to 'long'.
(set_machine_and_pid_properties): Don't assume pid_t fits in 32 bits.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xselect.c b/src/xselect.c index f23256346cb..eb6f8f3b161 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -458,7 +458,7 @@ x_decline_selection_request (struct input_event *event) | |||
| 458 | died in the meantime. Handle that case. */ | 458 | died in the meantime. Handle that case. */ |
| 459 | block_input (); | 459 | block_input (); |
| 460 | x_catch_errors (reply->display); | 460 | x_catch_errors (reply->display); |
| 461 | XSendEvent (reply->display, reply->requestor, False, 0L, &reply_base); | 461 | XSendEvent (reply->display, reply->requestor, False, 0, &reply_base); |
| 462 | XFlush (reply->display); | 462 | XFlush (reply->display); |
| 463 | x_uncatch_errors (); | 463 | x_uncatch_errors (); |
| 464 | unblock_input (); | 464 | unblock_input (); |
| @@ -632,7 +632,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 632 | } | 632 | } |
| 633 | 633 | ||
| 634 | /* Now issue the SelectionNotify event. */ | 634 | /* Now issue the SelectionNotify event. */ |
| 635 | XSendEvent (display, window, False, 0L, &reply_base); | 635 | XSendEvent (display, window, False, 0, &reply_base); |
| 636 | XFlush (display); | 636 | XFlush (display); |
| 637 | 637 | ||
| 638 | #ifdef TRACE_SELECTION | 638 | #ifdef TRACE_SELECTION |
| @@ -710,7 +710,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 710 | requestor that we're done. */ | 710 | requestor that we're done. */ |
| 711 | block_input (); | 711 | block_input (); |
| 712 | if (! waiting_for_other_props_on_window (display, window)) | 712 | if (! waiting_for_other_props_on_window (display, window)) |
| 713 | XSelectInput (display, window, 0L); | 713 | XSelectInput (display, window, 0); |
| 714 | 714 | ||
| 715 | TRACE1 ("Set %s to a 0-length chunk to indicate EOF", | 715 | TRACE1 ("Set %s to a 0-length chunk to indicate EOF", |
| 716 | XGetAtomName (display, cs->property)); | 716 | XGetAtomName (display, cs->property)); |
| @@ -1283,7 +1283,7 @@ x_get_window_property (Display *display, Window window, Atom property, | |||
| 1283 | 1283 | ||
| 1284 | /* First probe the thing to find out how big it is. */ | 1284 | /* First probe the thing to find out how big it is. */ |
| 1285 | result = XGetWindowProperty (display, window, property, | 1285 | result = XGetWindowProperty (display, window, property, |
| 1286 | 0L, 0L, False, AnyPropertyType, | 1286 | 0, 0, False, AnyPropertyType, |
| 1287 | actual_type_ret, actual_format_ret, | 1287 | actual_type_ret, actual_format_ret, |
| 1288 | actual_size_ret, | 1288 | actual_size_ret, |
| 1289 | &bytes_remaining, &tmp_data); | 1289 | &bytes_remaining, &tmp_data); |
| @@ -2314,7 +2314,7 @@ x_fill_property_data (Display *dpy, Lisp_Object data, void *ret, int format) | |||
| 2314 | else if (STRINGP (o)) | 2314 | else if (STRINGP (o)) |
| 2315 | { | 2315 | { |
| 2316 | block_input (); | 2316 | block_input (); |
| 2317 | val = (long) XInternAtom (dpy, SSDATA (o), False); | 2317 | val = XInternAtom (dpy, SSDATA (o), False); |
| 2318 | unblock_input (); | 2318 | unblock_input (); |
| 2319 | } | 2319 | } |
| 2320 | else | 2320 | else |