diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-10 09:52:42 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-10 09:53:51 -0700 |
| commit | a1cd8c96cad685912749efb395593524b199c536 (patch) | |
| tree | 46995ceae36b2d60dc33ad7c82535f2c475536cb /src/xselect.c | |
| parent | b0030269c9ca1263498341d51bbfc5387f489ab7 (diff) | |
| download | emacs-a1cd8c96cad685912749efb395593524b199c536.tar.gz | |
Prefer NUMBERP to spelling it out
* src/editfns.c (styled_format):
* src/frame.h (NUMVAL):
* src/image.c (parse_image_spec):
* src/lisp.h (CHECK_NUMBER_OR_FLOAT)
(CHECK_NUMBER_OR_FLOAT_COERCE_MARKER):
* src/process.c (Fsignal_process):
* src/xdisp.c (calc_pixel_width_or_height, on_hot_spot_p):
* src/xfaces.c (check_lface_attrs):
* src/xselect.c (x_fill_property_data, x_send_client_event):
Use NUMBERP rather than INTEGERP || FLOATP.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xselect.c b/src/xselect.c index 94a5584214f..e7e3fe72b14 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -2271,7 +2271,7 @@ x_fill_property_data (Display *dpy, Lisp_Object data, void *ret, int format) { Lisp_Object o = XCAR (iter); - if (INTEGERP (o) || FLOATP (o) || CONSP (o)) + if (NUMBERP (o) || CONSP (o)) { if (CONSP (o) && 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, else error ("DEST as a string must be one of PointerWindow or InputFocus"); } - else if (INTEGERP (dest) || FLOATP (dest) || CONSP (dest)) + else if (NUMBERP (dest) || CONSP (dest)) CONS_TO_INTEGER (dest, Window, wdest); else error ("DEST must be a frame, nil, string, number or cons"); |