Commit 79f59d41 authored by Tom Tromey's avatar Tom Tromey

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.
parent accb7b7e
......@@ -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);
......
......@@ -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;
}
......
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment