summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-09-26 22:54:51 -0700
committerKaz Kylheku <kaz@kylheku.com>2014-09-26 22:54:51 -0700
commita767b4b5016005fd3e37126e1437e8cca56b60e1 (patch)
tree63634e2a60dedb4595772a038b038dcfd2504f8f
parente899df28747291f464e6d3e7e615c5872998ef5e (diff)
downloadtxr-a767b4b5016005fd3e37126e1437e8cca56b60e1.tar.gz
txr-a767b4b5016005fd3e37126e1437e8cca56b60e1.tar.bz2
txr-a767b4b5016005fd3e37126e1437e8cca56b60e1.zip
* lib.c (do_and): Fix andf again: (andf) not producing
a function that returns t, as documented.
-rw-r--r--ChangeLog5
-rw-r--r--lib.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 444a2ce3..d98754ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-09-26 Kaz Kylheku <kaz@kylheku.com>
+ * lib.c (do_and): Fix andf again: (andf) not producing
+ a function that returns t, as documented.
+
+2014-09-26 Kaz Kylheku <kaz@kylheku.com>
+
Version 98.
* RELNOTES: Updated.
diff --git a/lib.c b/lib.c
index dfed7700..fbe6743b 100644
--- a/lib.c
+++ b/lib.c
@@ -4335,7 +4335,7 @@ val juxtv(val funlist)
static val do_and(val fun1_list, val args)
{
fun1_list = nullify(fun1_list);
- val ret = nil;
+ val ret = t;
for (; fun1_list; fun1_list = cdr(fun1_list))
if (nilp((ret = apply(car(fun1_list), args, nil))))