X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefpackage.lisp;h=ec8763c67a99994500464ce83eb42bf7c5877554;hb=fbe6e22af842835f7c70309f4d48064ca3984ad0;hp=b087dca4aa7e3a4b3924f0aa5dcfc8b88c624757;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/code/defpackage.lisp b/src/code/defpackage.lisp
index b087dca..ec8763c 100644
--- a/src/code/defpackage.lisp
+++ b/src/code/defpackage.lisp
@@ -11,9 +11,6 @@
 
 (in-package "SB!IMPL")
 
-(file-comment
- "$Header$")
-
 (defmacro defpackage (package &rest options)
   #!+sb-doc
   "Defines a new package called PACKAGE. Each of OPTIONS should be one of the
@@ -40,7 +37,7 @@
 	(doc nil))
     (dolist (option options)
       (unless (consp option)
-	(error 'program-error
+	(error 'simple-program-error
 	       :format-control "bogus DEFPACKAGE option: ~S"
 	       :format-arguments (list option)))
       (case (car option)
@@ -48,14 +45,14 @@
 	 (setf nicknames (stringify-names (cdr option) "package")))
 	(:size
 	 (cond (size
-		(error 'program-error
+		(error 'simple-program-error
 		       :format-control "can't specify :SIZE twice."))
 	       ((and (consp (cdr option))
 		     (typep (second option) 'unsigned-byte))
 		(setf size (second option)))
 	       (t
 		(error
-		 'program-error
+		 'simple-program-error
 		 :format-control ":SIZE is not a positive integer: ~S"
 		 :format-arguments (list (second option))))))
 	(:shadow
@@ -89,11 +86,11 @@
 	   (setf exports (append exports new))))
 	(:documentation
 	 (when doc
-	   (error 'program-error
+	   (error 'simple-program-error
 		  :format-control "multiple :DOCUMENTATION options"))
 	 (setf doc (coerce (second option) 'simple-string)))
 	(t
-	 (error 'program-error
+	 (error 'simple-program-error
 		:format-control "bogus DEFPACKAGE option: ~S"
 		:format-arguments (list option)))))
     (check-disjoint `(:intern ,@interns) `(:export  ,@exports))
@@ -116,7 +113,7 @@
       with x = (car list)
       for y in (rest list)
       for z = (remove-duplicates (intersection (cdr x)(cdr y) :test #'string=))
-      when z do (error 'program-error
+      when z do (error 'simple-program-error
 		       :format-control "Parameters ~S and ~S must be disjoint ~
 					but have common elements ~%   ~S"
 		       :format-arguments (list (car x)(car y) z)))))