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=373a64e9369c2e96c465eb462a035884c7e08fa6 fix conflicts --- diff --git a/ChangeLog b/ChangeLog index a717b52..e07a5f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +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 --git a/byte-stream.lisp b/byte-stream.lisp index 6e785fa..e303607 100644 --- a/byte-stream.lisp +++ b/byte-stream.lisp @@ -241,21 +241,22 @@ Make-Byte-Array-Output-Stream since the last call to this function." (replace result (slot-value stream 'excl::buffer)) result)) - (defmethod excl:device-extend ((stream extendable-buffer-output-stream) - need action) - (declare (ignore action)) - (let* ((len (file-position stream)) - (new-len (max (+ len need) (* 2 len))) - (old-buf (slot-value stream 'excl::buffer)) - (new-buf (make-array new-len :element-type '(unsigned-byte 8)))) - (declare (fixnum len) - (optimize (speed 3) (safety 0))) - (dotimes (i len) - (setf (aref new-buf i) (aref old-buf i))) - (setf (slot-value stream 'excl::buffer) new-buf) - (setf (slot-value stream 'excl::buffer-ptr) new-len) - ) - t) + (excl::without-package-locks + (defmethod excl:device-extend ((stream extendable-buffer-output-stream) + need action) + (declare (ignore action)) + (let* ((len (file-position stream)) + (new-len (max (+ len need) (* 2 len))) + (old-buf (slot-value stream 'excl::buffer)) + (new-buf (make-array new-len :element-type '(unsigned-byte 8)))) + (declare (fixnum len) + (optimize (speed 3) (safety 0))) + (dotimes (i len) + (setf (aref new-buf i) (aref old-buf i))) + (setf (slot-value stream 'excl::buffer) new-buf) + (setf (slot-value stream 'excl::buffer-ptr) new-len) + ) + t)) ) diff --git a/datetime.lisp b/datetime.lisp index 348cf58..30c815c 100644 --- a/datetime.lisp +++ b/datetime.lisp @@ -45,7 +45,7 @@ (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) diff --git a/debian/changelog b/debian/changelog index 47d8f07..2f4b6b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +cl-kmrcl (1.97-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Tue, 18 Sep 2007 23:54:44 -0600 + +cl-kmrcl (1.96-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Mon, 10 Sep 2007 18:18:11 -0600 + cl-kmrcl (1.95-1) unstable; urgency=low * New upstream