Fix merge: Edwin may depend on (blowfish) and (gdbm) packages.

diff --git a/src/edwin/edwin.pkg b/src/edwin/edwin.pkg
index fa974611993991c4c2b5239ae8b6f824fc6ff407..252ab4cbfe9c7f80271092f776cb2b8dc695fc61 100644 (file)
--- a/src/edwin/edwin.pkg
+++ b/src/edwin/edwin.pkg
@@ -124,7 +124,6 @@ USA.
          (port/output-channel output-port-channel)
          (port/state textual-port-state)
          generic-port-operation:write-substring)
-  #|
   (import (blowfish)
          blowfish-encrypt-port
          blowfish-file?
@@ -143,7 +142,6 @@ USA.
          gdbm_fast
          gdbm_replace
          gdbm_wrcreat)
-  |#
   (export ()
          create-editor
          create-editor-args

diff --git a/src/edwin/make.scm b/src/edwin/make.scm
index 7ed764e0d3cd2316697c42c9f4b572a193079c53..f4287ccc44124b334c6bcaf2ef20ca34018d8fa6 100644 (file)
--- a/src/edwin/make.scm
+++ b/src/edwin/make.scm
@@ -28,11 +28,12 @@ USA.
 
 (declare (usual-integrations))
 
-(load-option 'sos)
-(load-option 'xml)
+(for-each load-option '(sos xml blowfish gdbm))
+
 (with-loader-base-uri (system-library-uri "edwin/")
   (lambda ()
     (load-package-set "edwin"
       `((alternate-package-loader
         . ,(load "edwin.bld" system-global-environment))))))
+
 (add-subsystem-identification! "Edwin" '(3 117 3))
\ No newline at end of file