fix conflicts

[kmrcl.git] / datetime.lisp

diff --git a/datetime.lisp b/datetime.lisp
index b01bf33d323a8b0cb9c601a62a80609244f8a9de..30c815c9d01d5bf482e084c5c6ee6ed8b9c0dd7d 100644 (file)
--- a/datetime.lisp
+++ b/datetime.lisp
@@ -40,12 +40,12 @@
   (multiple-value-bind (sec min hr dy mn yr) (decode-universal-time tm)
     (pretty-date yr mn dy hr min sec)))
 
-(defun date-string (ut)
+(defun date-string (&optional (ut (get-universal-time)))
   (if (typep ut 'integer)
       (multiple-value-bind (sec min hr day mon year dow daylight-p zone)
           (decode-universal-time ut)
         (declare (ignore daylight-p zone))
-        (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~], ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d"
+        (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~] ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d"
                 dow
                 day
                 (1- mon)