Author: ehuelsmann Date: Sun Mar 16 13:12:16 2008 New Revision: 33

Modified: branches/1.0.x/config.lisp branches/1.0.x/tests/tests.lisp Log: Merge r30:32 (test expectation fix and ITEMS fix).

Modified: branches/1.0.x/config.lisp ============================================================================== --- branches/1.0.x/config.lisp (original) +++ branches/1.0.x/config.lisp Sun Mar 16 13:12:16 2008 @@ -271,7 +271,7 @@ (mapcar #'(lambda (x) (cons (car x) (get-option config section-name (car x) ;; option-name - :expand t + :expand expand :defaults defaults))) (section-options section)) (section-options section))))

Modified: branches/1.0.x/tests/tests.lisp ============================================================================== --- branches/1.0.x/tests/tests.lisp (original) +++ branches/1.0.x/tests/tests.lisp Sun Mar 16 13:12:16 2008 @@ -136,7 +136,9 @@ p=q z=%(p)s ") - (items (read-stream (make-config) s) "n" :expand nil)) '(("z" "%(p)s") ("p" . "q"))) + (items (read-stream (make-config) s) "n" :expand nil)) + '(("z" . "%(p)s") + ("p" . "q"))) T)

(deftest basic.items.2 @@ -144,7 +146,8 @@ p=q z=%(p)s ") - (items (read-stream (make-config) s) "n" :expand t)) '(("z" . "q") ("p" . "q"))) + (items (read-stream (make-config) s) "n" :expand t)) + '(("z" . "q") ("p" . "q"))) T)

(deftest basic.items.3