From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 17 Jun 2011 15:18:54 +0000 (-0400)
Subject: * src/fns.c (Fsafe_length): Yet another int/Lisp_Object mixup.
X-Git-Tag: emacs-pretest-24.0.90~104^2~531
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ff2bc4101a77fd8710dbad5069c81805bc17f31c;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index e8aa1c67d3c..f8e791285b1 100644
--- 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 a19c886e3e1..8057e429176 100644
--- 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; ; )