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/xfaces.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/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index a4f1aa89f71..453fd58d676 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -1669,8 +1669,7 @@ check_lface_attrs (Lisp_Object attrs[LFACE_VECTOR_SIZE]) || SYMBOLP (attrs[LFACE_SWIDTH_INDEX])); eassert (UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX]) || IGNORE_DEFFACE_P (attrs[LFACE_HEIGHT_INDEX]) - || INTEGERP (attrs[LFACE_HEIGHT_INDEX]) - || FLOATP (attrs[LFACE_HEIGHT_INDEX]) + || NUMBERP (attrs[LFACE_HEIGHT_INDEX]) || FUNCTIONP (attrs[LFACE_HEIGHT_INDEX])); eassert (UNSPECIFIEDP (attrs[LFACE_WEIGHT_INDEX]) || IGNORE_DEFFACE_P (attrs[LFACE_WEIGHT_INDEX]) |