From: Kevin Rosenberg Date: Thu, 31 Jan 2008 01:54:16 +0000 (-0700) Subject: fix conflicts X-Git-Tag: v1.98~1 X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=commitdiff_plain;h=1142016daa209cb657b035c651641a94ef49892a;hp=-c fix conflicts --- 1142016daa209cb657b035c651641a94ef49892a diff --combined ChangeLog index a717b52,054ba37..e07a5f9 --- a/ChangeLog +++ b/ChangeLog @@@ -1,7 -1,12 +1,16 @@@ - 28 Jun 2008 Kevin Rosenberg - * Version 1.96 ++28 Jan 2008 Kevin Rosenberg ++ * Version 1.98 + * {datetime,strings,tests}.lisp: Add remove-char-string + + 18 Sep 2007 Kevin Rosenberg + * Version 1.97 + * datetime.lisp: Improve output format for date-string + + 10 Sep 2007 Kevin Rosenberg + * Version 1.96 + * byte-stream.lisp: Use without-package-locks as suggested + by Daniel Gackle. + 01 Jun 2007 Kevin Rosenberg * Version 1.95 * {datetime,package}.lisp: Add day-of-week and pretty-date-ut diff --combined datetime.lisp index 348cf58,dd813c4..30c815c --- a/datetime.lisp +++ b/datetime.lisp @@@ -40,12 -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)