(Fstring_to_number): Use make_fixnum_or_float.

2 files changed, 8 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 33da6a999e0..2be0b9f26ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2001-10-11  Gerd Moellmann  <gerd@gnu.org>
 
+        * editfns.c (Fuser_uid, Fuser_real_uid): Use make_fixnum_or_float.
+        (Fuser_full_name): Fix bug treating a float as a fixnum.
+
+        * data.c (Fstring_to_number): Use make_fixnum_or_float.
+
+        * lisp.h (make_fixnum_or_float): New macro.
+        
         * lisp.h (circular_list_error): Add prototype.
 
         * data.c (Qcircular_list): New variable.
diff --git a/src/data.c b/src/data.c
index ad39e82a057..336afa98d8c 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2353,10 +2353,7 @@ If the base used is not 10, floating point is not recognized.")
           v = v * b + digit;
         }
 
-      if (v > (EMACS_UINT) (VALMASK >> 1))
-        val = make_float (sign * v);
-      else
-        val = make_number (sign * (int) v);
+      val = make_fixnum_or_float (sign * v);
     }
 
   return val;