Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv15844

Modified Files: format.lisp Log Message: Fixed ~{ format directive which didn't play quite right with ~^.

Date: Wed Mar 24 14:30:15 2004 Author: ffjeld

Index: movitz/losp/muerte/format.lisp diff -u movitz/losp/muerte/format.lisp:1.2 movitz/losp/muerte/format.lisp:1.3 --- movitz/losp/muerte/format.lisp:1.2 Mon Jan 19 06:23:46 2004 +++ movitz/losp/muerte/format.lisp Wed Mar 24 14:30:15 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Sat Mar 23 01:18:36 2002 ;;;; -;;;; $Id: format.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ +;;;; $Id: format.lisp,v 1.3 2004/03/24 19:30:15 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

@@ -241,10 +241,10 @@ (multiple-value-setq (i args) (format-by-string control-string (1+ i) (1- loop-limit) args)))) (t (let ((loop-args (pop args))) - (if (or (zerop loop-limit) (null loop-args)) - (setf i (skip-iteration control-string (1+ i))) - (setf i (format-by-string control-string (1+ i) - (1- loop-limit) loop-args))))))))) + (unless (or (zerop loop-limit) (null loop-args)) + (format-by-string control-string (1+ i) + (1- loop-limit) loop-args)) + (setf i (skip-iteration control-string (1+ i))))))))) (#} (if (and args (or (not loop-limit) (not (zerop loop-limit)))) (setf loop-limit (and loop-limit (1- loop-limit)) i (1- start))