CMUCL commit: RELEASE-20B-BRANCH src/code (extfmts.lisp)

[Raymond Toy]

    Date: Wednesday, September 8, 2010 @ 20:41:03
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/code
     Tag: RELEASE-20B-BRANCH

Modified: extfmts.lisp

Correct docstring, from HEAD.


--------------+
 extfmts.lisp |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)


Index: src/code/extfmts.lisp
diff -u src/code/extfmts.lisp:1.35.4.6 src/code/extfmts.lisp:1.35.4.7
--- src/code/extfmts.lisp:1.35.4.6	Mon Sep  6 11:35:28 2010
+++ src/code/extfmts.lisp	Wed Sep  8 20:41:03 2010
@@ -5,7 +5,7 @@
 ;;; domain.
 ;;; 
 (ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/code/extfmts.lisp,v 1.35.4.6 2010-09-06 15:35:28 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/code/extfmts.lisp,v 1.35.4.7 2010-09-09 00:41:03 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -921,11 +921,13 @@
   the length of String).  If the string is not large enough to hold
   all of characters, then some octets will not be converted.  A State
   may also be specified; this is used as the state of the external
-  format.
-
-  Four values are returned: the string, the number of characters read,
-  the number of octets actually consumed and the new state of the
-  external format."
+  format.  An error method may also be specified by Error, which
+  defaults to NIL to mean the default handling of conversion errors is
+  done.
+
+  Four values are returned: the string, the position of where the next
+  character would be read into the string, the number of octets
+  actually consumed and the new state of the external format."
   (declare (type (simple-array (unsigned-byte 8) (*)) octets)
 	   (type kernel:index start s-start)
 	   (type (or kernel:index null) end)