Simplify bignum->intmax conversion

* src/lisp.h (integer_to_intmax, integer_to_uintmax): New functions.
* src/data.c (cons_to_unsigned, cons_to_signed)
(arith_driver):
* src/dbusbind.c (xd_extract_signed, xd_extract_unsigned):
* src/dispnew.c (sit_for):
* src/editfns.c (styled_format):
* src/emacs-module.c (module_extract_integer):
* src/fileio.c (file_offset):
* src/font.c (font_unparse_xlfd, Fopen_font):
* src/xdisp.c (calc_line_height_property):
* src/process.c (handle_child_signal):

1 files changed, 13 insertions, 13 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index bd246799b23..798413d091c 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5765,20 +5765,20 @@ sit_for (Lisp_Object timeout, bool reading, int display_option)
   if (display_option > 1)
     redisplay_preserve_echo_area (2);
 
-  if (FIXNUMP (timeout))
+  if (INTEGERP (timeout))
     {
-      sec = XFIXNUM (timeout);
-      if (sec <= 0)
-        return Qt;
-      nsec = 0;
-    }
-  else if (BIGNUMP (timeout))
-    {
-      if (NILP (Fnatnump (timeout)))
-        return Qt;
-      sec = bignum_to_intmax (timeout);
-      if (sec == 0)
-        sec = WAIT_READING_MAX;
+      if (integer_to_intmax (timeout, &sec))
+        {
+          if (sec <= 0)
+            return Qt;
+          sec = min (sec, WAIT_READING_MAX);
+        }
+      else
+        {
+          if (NILP (Fnatnump (timeout)))
+            return Qt;
+          sec = WAIT_READING_MAX;
+        }
       nsec = 0;
     }
   else if (FLOATP (timeout))