0.8.17.13:

	Fix FORMATTER on ~@[X~] (PFD ansi-tests)

diff --git a/NEWS b/NEWS
index 9da1e74..f22e243 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,8 +16,10 @@ changes in sbcl-0.8.18 relative to sbcl-0.8.17:
   * fixed some bugs revealed by Paul Dietz' test suite:
     ** INCF, DECF and REMF evaluate their place form as specified in
        CLtS 5.1.3.
-    ** FORMATTER expands ~{ iteration directives with V or #
+    ** FORMATTER expands ~{ ~} iteration directives with V or #
        parameters correctly.
+    ** FORMATTER deals with the ~@[ ~] conditional directive where the
+       consequent uses no arguments correctly.
 
 changes in sbcl-0.8.17 relative to sbcl-0.8.16:
   * new feature: a build-time option (controlled by the :SB-UNICODE

diff --git a/src/code/late-format.lisp b/src/code/late-format.lisp
index a16aa5f..d758b0d 100644 (file)
--- a/src/code/late-format.lisp
+++ b/src/code/late-format.lisp
@@ -836,7 +836,7 @@
            (let ((*simple-args* *simple-args*))
              (values (expand-directive-list sublist)
                      *simple-args*))
-         (cond ((eq *simple-args* (cdr new-args))
+         (cond ((and new-args (eq *simple-args* (cdr new-args)))
                 (setf *simple-args* new-args)
                 `(when ,(caar new-args)
                    ,@guts))

diff --git a/version.lisp-expr b/version.lisp-expr
index 18f6ed0..c04131a 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.17.12"
+"0.8.17.13"