From: Christophe Rhodes <csr21@cantab.net>
Date: Mon, 17 Sep 2007 18:38:16 +0000 (+0000)
Subject: 1.0.9.61: Fix %report-reader-error
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=134fa6b3f7c5f4bb0652e74227d940a9e7a83563;p=sbcl.git

1.0.9.61: Fix %report-reader-error
	It was missing an apply (or, equivalently, a ~?) for printing
	the simple-condition part of the error.
---

diff --git a/src/code/condition.lisp b/src/code/condition.lisp
index 6e04cda..44270bb 100644
--- a/src/code/condition.lisp
+++ b/src/code/condition.lisp
@@ -779,8 +779,7 @@
                 (class-name (class-of condition))
                 pos lineno colno error-stream)
         (when simple
-          (format stream ":~2I~_")
-          (format stream
+          (format stream ":~2I~_~?"
                   (simple-condition-format-control condition)
                   (simple-condition-format-arguments condition)))))))
 
diff --git a/tests/reader.pure.lisp b/tests/reader.pure.lisp
index 62bd000..7f88b03 100644
--- a/tests/reader.pure.lisp
+++ b/tests/reader.pure.lisp
@@ -238,3 +238,10 @@
 (let ((*readtable* (copy-readtable)))
   (set-syntax-from-char #\7 #\Space)
   (assert (string= (format nil "~7D" 1) "      1")))
+
+(let ((symbol (find-symbol "DOES-NOT-EXIST" "CL-USER")))
+  (assert (null symbol))
+  (handler-case
+      (read-from-string "CL-USER:DOES-NOT-EXIST")
+    (reader-error (c)
+      (princ c))))
diff --git a/version.lisp-expr b/version.lisp-expr
index 0569929..18f95b3 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.9.60"
+"1.0.9.61"