X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ferror.lisp;h=9086a9416d37acd7a7da466cc314999d5d34afa2;hb=829ced3e78a23ba153ba4db64e6ea6984c2313b6;hp=db40332d30f9412c229107978e82827044c26329;hpb=e5d96999ae4388181ddb0c113313f26afbe997e8;p=sbcl.git

diff --git a/src/code/error.lisp b/src/code/error.lisp
index db40332..9086a94 100644
--- a/src/code/error.lisp
+++ b/src/code/error.lisp
@@ -51,9 +51,10 @@
         (t
          (error 'simple-type-error
                 :datum datum
-                :expected-type '(or symbol string)
-                :format-control "bad argument to ~S: ~S"
-                :format-arguments (list fun-name datum)))))
+                :expected-type '(or symbol string function)
+                :format-control "Condition designator ~s is not of type ~s."
+                :format-arguments (list datum
+                                        '(or symbol string function))))))
 
 (define-condition layout-invalid (type-error)
   ()
@@ -116,10 +117,10 @@
    (lambda (c s)
      (let ((stream (stream-error-stream c))
            (code (character-encoding-error-code c)))
-       (format s "~@<encoding error on stream ~S (~S ~S): ~2I~_~
+       (format s "~@<~S stream encoding error on ~S: ~2I~_~
                   the character with code ~D cannot be encoded.~@:>"
-               stream ':external-format
                (character-coding-error-external-format c)
+               stream
                code)))))
 (define-condition stream-decoding-error (stream-error character-decoding-error)
   ()
@@ -127,17 +128,17 @@
    (lambda (c s)
      (let ((stream (stream-error-stream c))
            (octets (character-decoding-error-octets c)))
-       (format s "~@<decoding error on stream ~S (~S ~S): ~2I~_~
+       (format s "~@<~S stream decoding error on ~S: ~2I~_~
                   the octet sequence ~S cannot be decoded.~@:>"
-               stream ':external-format
                (character-coding-error-external-format c)
+               stream
                octets)))))
 
 (define-condition c-string-encoding-error (character-encoding-error)
   ()
   (:report
    (lambda (c s)
-     (format s "~@<c-string encoding error (:external-format ~S): ~2I~_~
+     (format s "~@<~S c-string encoding error: ~2I~_~
                   the character with code ~D cannot be encoded.~@:>"
                (character-coding-error-external-format c)
                (character-encoding-error-code c)))))
@@ -146,7 +147,7 @@
   ()
   (:report
    (lambda (c s)
-     (format s "~@<c-string decoding error (:external-format ~S): ~2I~_~
+     (format s "~@<~S c-string decoding error: ~2I~_~
                   the octet sequence ~S cannot be decoded.~@:>"
              (character-coding-error-external-format c)
              (character-decoding-error-octets c)))))