From 1b56c58e2c81b78fccdaed3e4618a34956eb57c8 Mon Sep 17 00:00:00 2001
From: wlott <wlott>
Date: Fri, 4 Feb 1994 15:24:38 +0000
Subject: [PATCH] Fixed defpackage to combine multiple use, export, and import
 options correctly.

---
 code/package.lisp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/package.lisp b/code/package.lisp
index 5eb4afccc..f02866a8e 100644
--- a/code/package.lisp
+++ b/code/package.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/package.lisp,v 1.34 1993/11/30 17:46:32 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/package.lisp,v 1.35 1994/02/04 15:24:38 wlott Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -650,7 +650,7 @@
 		       (acons package-name names shadowing-imports))))))
 	(:use
 	 (let ((new (stringify-names (cdr option) "package")))
-	   (setf use (append-unique new nicknames :use))
+	   (setf use (append-unique new use :use))
 	   (setf use-p t)))
 	(:import-from
 	 (let ((package-name (stringify-name (second option) "package"))
@@ -664,11 +664,11 @@
 	(:intern
 	 (let ((new (stringify-names (cdr option) "symbol")))
 	   (setf incomming (append-unique new incomming :intern))
-	   (setf outgoing (append-unique new incomming :intern))
+	   (setf outgoing (append-unique new outgoing :intern))
 	   (setf interns (append interns new))))
 	(:export
 	 (let ((new (stringify-names (cdr option) "symbol")))
-	   (setf outgoing (append-unique new incomming :export))
+	   (setf outgoing (append-unique new outgoing :export))
 	   (setf exports (append exports new))))
 	(t
 	 (error "Bogus DEFPACKAGE option: ~S" option))))
-- 
GitLab