From dcbc1634efadeef3f08c353f0c72eccba6c9b755 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Tue, 19 Feb 2019 08:06:01 -0700
Subject: [PATCH] Fix merge: Edwin may depend on (blowfish) and (gdbm)
 packages.

---
 src/edwin/edwin.pkg | 2 --
 src/edwin/make.scm  | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/edwin/edwin.pkg b/src/edwin/edwin.pkg
index fa9746119..252ab4cbf 100644
--- 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 7ed764e0d..f4287ccc4 100644
--- 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
-- 
2.25.1