Changes from arch/CVS synchronization

diff --git a/srfi/ChangeLog b/srfi/ChangeLog
index 401dfee..ecb7679 100644 (file)
--- a/srfi/ChangeLog
+++ b/srfi/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-13  Stephen Compall  <s11@member.fsf.org>
+
+       * srfi-69.scm (without-keyword-args): Use `cdr' instead of
+       `rest'.
+
 2007-12-03  Stephen Compall  <s11@member.fsf.org>
 
        * srfi-69.scm: New file.

diff --git a/srfi/srfi-69.scm b/srfi/srfi-69.scm
index c000c29..7da560b 100644 (file)
--- a/srfi/srfi-69.scm
+++ b/srfi/srfi-69.scm
@@ -143,7 +143,7 @@ follow them."
     (cond ((null? rest-list) (reverse! acc))
          ((keyword? (first rest-list))
           (lp acc (cddr rest-list)))
-         (else (lp (cons (first rest-list) acc) (rest rest-list))))))
+         (else (lp (cons (first rest-list) acc) (cdr rest-list))))))
 
 (define (guile-ht-ctor weakness)
   "Answer the Guile HT constructor for the given WEAKNESS."

diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index 38b4b56..72a2491 100644 (file)
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-13  Stephen Compall  <s11@member.fsf.org>
+
+       * tests/srfi-69.test (SRFI-69)[can use all arguments, including
+       size]: New test.
+
 2007-12-03  Stephen Compall  <s11@member.fsf.org>
 
        * tests/srfi-69.test: New file.

diff --git a/test-suite/tests/srfi-69.test b/test-suite/tests/srfi-69.test
index 7f1fa44..1d240d2 100644 (file)
--- a/test-suite/tests/srfi-69.test
+++ b/test-suite/tests/srfi-69.test
@@ -102,4 +102,7 @@ case-insensitive strings to `equal?'-tested values."
       (and (= 1 (hash-table-size ht))
           (lset= equal? '((b . 53)) (hash-table->alist ht)))))
 
+  (pass-if "can use all arguments, including size"
+    (hash-table? (make-hash-table equal? hash #:weak 'key 31)))
+
 )