* src/fns.c (Fsafe_length): Yet another int/Lisp_Object mixup.

diff --git a/src/ChangeLog b/src/ChangeLog
index e8aa1c67d3c7b7effa6810cba8168c0e3a39096c..f8e791285b19b26c3ce196c36035c456258fa8e4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * fns.c (Fsafe_length): Yet another int/Lisp_Object mixup.
+
 2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lisp.h: Include <limits.h>, for INT_MAX, LONG_MAX, LLONG_MAX.

diff --git a/src/fns.c b/src/fns.c
index a19c886e3e1f0ef002db37d7337e6c8c748fcf68..8057e429176746587d18736822407cfb24dc6282 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -168,7 +168,7 @@ which is at least the number of distinct elements.  */)
   uintmax_t lolen = 1;
 
   if (! CONSP (list))
-    return 0;
+    return make_number (0);
 
   /* halftail is used to detect circular lists.  */
   for (tail = halftail = list; ; )