Date: Monday, August 9, 2010 @ 18:46:42 Author: rtoy Path: /project/cmucl/cvsroot/src/code Tag: RELEASE-20B-BRANCH Modified: stream.lisp Merge fix from HEAD for broken FILE-POSITION. -------------+ stream.lisp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) Index: src/code/stream.lisp diff -u src/code/stream.lisp:1.94 src/code/stream.lisp:1.94.4.1 --- src/code/stream.lisp:1.94 Sun Jul 4 23:40:02 2010 +++ src/code/stream.lisp Mon Aug 9 18:46:42 2010 @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /project/cmucl/cvsroot/src/code/stream.lisp,v 1.94 2010-07-05 03:40:02 rtoy Exp $") + "$Header: /project/cmucl/cvsroot/src/code/stream.lisp,v 1.94.4.1 2010-08-09 22:46:42 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -364,8 +364,13 @@ (t (let ((res (funcall (lisp-stream-misc stream) stream :file-position nil))) + ;; For Unicode, the LISP-STREAM-MISC function handles + ;; everything, so we can just return the result. + #-unicode (when res - (- res (- in-buffer-length (lisp-stream-in-index stream))))))))) + (- res (- in-buffer-length (lisp-stream-in-index stream)))) + #+unicode + res))))) ;;; File-Length -- Public