X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Flate-format.lisp;h=3d821ad0fa16da28601a0500fea0468ab02301ae;hb=51cf665f514935c8067f86f3850fd917731cada0;hp=a0d204ebeedcd84a8567f1578109aabca3bc1570;hpb=148e3820ad314a9b59d0133c1d60eaac4af9118b;p=sbcl.git

diff --git a/src/code/late-format.lisp b/src/code/late-format.lisp
index a0d204e..3d821ad 100644
--- a/src/code/late-format.lisp
+++ b/src/code/late-format.lisp
@@ -327,7 +327,7 @@
        (values (progn ,@body-without-decls)
 	       ,directives))))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
+(eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute)
 
 (defun %set-format-directive-expander (char fn)
   (setf (aref *format-directive-expanders* (char-code (char-upcase char))) fn)
@@ -1117,7 +1117,8 @@
 	 (block nil
 	   ,@(let ((*expander-next-arg-macro* 'expander-pprint-next-arg)
 		   (*only-simple-args* nil)
-		   (*orig-args-available* t))
+		   (*orig-args-available*
+		    (if atsignp *orig-args-available* t)))
 	       (expand-directive-list insides)))))))
 
 (defun expand-format-justification (segments colonp atsignp first-semi params)