From: Tom Tromey <tom@tromey.com>
Date: Fri, 10 Aug 2018 00:02:00 +0000 (-0600)
Subject: Fix up for bignums after merge from trunk
X-Git-Tag: emacs-27.0.90~4598^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=79f59d41a3d2ef3b4a9a87265bf517206a5837ad;p=emacs.git

Fix up for bignums after merge from trunk

* src/character.c (char_width): Use XFIXNUM.
* src/editfns.c (styled_format): Use XFIXNUM, XUFIXNUM.
* src/fns.c (Fproper_list_p): Use make_fixnum.
---

diff --git a/src/character.c b/src/character.c
index 851e61e778f..0b14e476c13 100644
--- a/src/character.c
+++ b/src/character.c
@@ -294,7 +294,7 @@ char_width (int c, struct Lisp_Char_Table *dp)
 	    if (GLYPH_CODE_P (ch))
 	      c = GLYPH_CODE_CHAR (ch);
 	    else if (CHARACTERP (ch))
-	      c = XFASTINT (ch);
+	      c = XFIXNUM (ch);
 	    if (c >= 0)
 	      {
 		int w = CHARACTER_WIDTH (c);
diff --git a/src/editfns.c b/src/editfns.c
index b1b9eb632f3..a109906e1df 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4749,12 +4749,12 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
 		    {
 		      if (binary_as_unsigned)
 			{
-			  x = XUINT (arg);
+			  x = XUFIXNUM (arg);
 			  negative = false;
 			}
 		      else
 			{
-			  EMACS_INT i = XINT (arg);
+			  EMACS_INT i = XFIXNUM (arg);
 			  negative = i < 0;
 			  x = negative ? -i : i;
 			}
diff --git a/src/fns.c b/src/fns.c
index 38b2d281f07..825880643ac 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -163,7 +163,7 @@ A proper list is neither circular nor dotted (i.e., its last cdr is nil).  */
     return Qnil;
   if (MOST_POSITIVE_FIXNUM < len)
     xsignal0 (Qoverflow_error);
-  return make_number (len);
+  return make_fixnum (len);
 }
 
 DEFUN ("string-bytes", Fstring_bytes, Sstring_bytes, 1, 1, 0,