summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fd14c2e9..4ae13197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-02-11 Kaz Kylheku <kaz@kylheku.com>
+ * eval.c (if_fun): Bugfix: forgotten handling of optional
+ alternative argument.
+
+2014-02-11 Kaz Kylheku <kaz@kylheku.com>
+
* eval.c (subst_vars): Bugfix: results of expressions not
treated in the same way as variables: lists not stringified,
causing expansions with parentheses, and sometimes errors
diff --git a/eval.c b/eval.c
index d97f0cfd..eff15bb1 100644
--- a/eval.c
+++ b/eval.c
@@ -2226,7 +2226,7 @@ static void reg_var(val sym, val *loc)
static val if_fun(val cond, val then, val alt)
{
- return if3(cond, then, alt);
+ return if3(cond, then, default_bool_arg(alt));
}
static val or_fun(val vals)