From d306dcf414583a2c8fe6bd71f85977e4050acdd1 Mon Sep 17 00:00:00 2001 From: wlott <wlott> Date: Sat, 15 Sep 1990 17:58:06 +0000 Subject: [PATCH] Added noise to load PCL if :no-pcl isn't in *features*. Moved the (in-package "USER") from before the save-lisp progn to inside it so that the progn form gets read into the correct package. --- tools/worldload.lisp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/worldload.lisp b/tools/worldload.lisp index b7ec7a25b..ae9e87238 100644 --- a/tools/worldload.lisp +++ b/tools/worldload.lisp @@ -20,6 +20,7 @@ (setf (ext:search-list "assem:") '("lisp:assembly/")) (setf (ext:search-list "hem:") '("lisp:hemlock/")) (setf (ext:search-list "clx:") '("lisp:clx/")) +(setf (ext:search-list "pcl:") '("lisp:pcl/")) ;;; This must be here, because it's where assert-user-package is defined. (load "code:save") @@ -136,13 +137,14 @@ Don't install any dir translations, 'cause we want the real things. (ed::add-definition-dir-translation "/usr2/lisp/" "/afs/cs/project/clisp/systems/") +|# + ;;; PCL. ;;; -(load "pcl:defsys") -(pcl::load-pcl) +#-no-pcl (load "pcl:defsys") +#-no-pcl (pcl::load-pcl) -|# ;;; Load these after PCL. ;;; @@ -154,15 +156,11 @@ Don't install any dir translations, 'cause we want the real things. ;;; (clrhash lisp::*search-list-table*) - -;;; And we want to be in the USER package when the command line switches -;;; run. -;;; -(in-package "USER") - ;;; Okay, build the thing! ;;; (progn + ;; We want to be in the USER package when the command line switches run. + (in-package "USER") (setq - nil) (setq + nil) (setq * nil) -- GitLab