summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-12-05 19:14:12 -0800
committerKaz Kylheku <kaz@kylheku.com>2014-12-05 19:14:12 -0800
commit93b8e741fcf0b4349653000eca67ffb8f8c95d01 (patch)
treebb05016b1f39b22192d3290f26b329f44b5cce90
parent7de541afba40076a0065285f3e392f507ee2bdc3 (diff)
downloadtxr-93b8e741fcf0b4349653000eca67ffb8f8c95d01.tar.gz
txr-93b8e741fcf0b4349653000eca67ffb8f8c95d01.tar.bz2
txr-93b8e741fcf0b4349653000eca67ffb8f8c95d01.zip
* lib.c (set_diff): Bugfix: use member rather than find,
so that a nil set element is handled properly.
-rw-r--r--ChangeLog5
-rw-r--r--lib.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 493645d3..766378f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-12-05 Kaz Kylheku <kaz@kylheku.com>
+ * lib.c (set_diff): Bugfix: use member rather than find,
+ so that a nil set element is handled properly.
+
+2014-12-05 Kaz Kylheku <kaz@kylheku.com>
+
* Makefile (INSTALL): Bugfix: touch -r $(2) does not work
right when $(2) is a wildcard like path/to/*.txr. It touches files in
the source tree to the timestamp of the argument after -r. Putting in
diff --git a/lib.c b/lib.c
index aba04b39..82eb4755 100644
--- a/lib.c
+++ b/lib.c
@@ -5998,7 +5998,7 @@ val set_diff(val list1, val list2, val testfun, val keyfun)
val item = car(list1);
val list1_key = funcall1(keyfun, item);
- if (!find(list1_key, list2, testfun, keyfun))
+ if (!member(list1_key, list2, testfun, keyfun))
ptail = list_collect(ptail, item);
}
}