From f6d910d0db0ea965ba6fb00fac6e796d42a54b6e Mon Sep 17 00:00:00 2001
From: jjgarcia <jjgarcia>
Date: Tue, 25 Nov 2003 15:56:27 +0000
Subject: [PATCH] Fixed two typos regarding FORMAT-ERROR.

---
 src/c/symbols_list.h    | 2 +-
 src/clos/conditions.lsp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/c/symbols_list.h b/src/c/symbols_list.h
index abba0dd24..d4555c3df 100644
--- a/src/c/symbols_list.h
+++ b/src/c/symbols_list.h
@@ -1229,7 +1229,7 @@ cl_symbols[] = {
 {KEY_ "CATCHALL", KEYWORD, NULL, -1, OBJNULL},
 {KEY_ "CIRCLE", KEYWORD, NULL, -1, OBJNULL},
 {KEY_ "COMPILE-TOPLEVEL", KEYWORD, NULL, -1, OBJNULL},
-{KEY_ "CONTROL-STRING", CL_ORDINARY, NULL, -1, OBJNULL},
+{KEY_ "CONTROL-STRING", KEYWORD, NULL, -1, OBJNULL},
 {KEY_ "CREATE", KEYWORD, NULL, -1, OBJNULL},
 {KEY_ "DATUM", KEYWORD, NULL, -1, OBJNULL},
 {KEY_ "DEFAULT", KEYWORD, NULL, -1, OBJNULL},
diff --git a/src/clos/conditions.lsp b/src/clos/conditions.lsp
index e9cc33c6e..226be9878 100644
--- a/src/clos/conditions.lsp
+++ b/src/clos/conditions.lsp
@@ -606,7 +606,7 @@ returns with NIL."
 ;;;
 (define-condition simple-program-error (simple-condition program-error) ())
 
-(define-condition format-error (error)
+(define-condition format-error (simple-error)
   ((control-string :reader format-error-control-string
 		   :initarg :control-string
 		   #+cmu-format :initform
@@ -621,8 +621,8 @@ returns with NIL."
 			"~:[~;Error in format: ~]~
 			 ~?~@[~%  ~A~%  ~V@T^~]"
 			(format-error-print-banner condition)
-			(simple-error-format-control condition)
-			(simple-error-format-arguments condition)
+			(simple-condition-format-control condition)
+			(simple-condition-format-arguments condition)
 			(format-error-control-string condition)
 			(format-error-offset condition)))))