summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/fns.c2
2 files changed, 5 insertions, 1 deletions
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; ; )