From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Wed, 18 Jan 2017 22:22:49 +0000 (-0700)
Subject: x11-screen: Import os/interprogram-cut and os/interprogram-paste.
X-Git-Tag: mit-scheme-pucked-9.2.12~238
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=4045ba4ca353c6e817e234a031c9254782a4de0a;p=mit-scheme.git

x11-screen: Import os/interprogram-cut and os/interprogram-paste.
---

diff --git a/src/x11-screen/make.scm b/src/x11-screen/make.scm
index 6a2767df4..e27451b44 100644
--- a/src/x11-screen/make.scm
+++ b/src/x11-screen/make.scm
@@ -7,12 +7,4 @@ Load the X11-Screen option. |#
 (with-loader-base-uri (system-library-uri "x11-screen/")
   (lambda ()
     (load-package-set "x11-screen")))
-(add-subsystem-identification! "X11-Screen" '(0 1))
-
-;; Reassign these (edwin) package bindings(!).
-(let ((edwin (->environment '(edwin)))
-      (x11 (->environment '(edwin screen x11-screen))))
-  (for-each (lambda (name)
-	      (environment-assign! edwin name (environment-lookup x11 name)))
-	    '(os/interprogram-cut
-	      os/interprogram-paste)))
\ No newline at end of file
+(add-subsystem-identification! "X11-Screen" '(0 1))
\ No newline at end of file
diff --git a/src/x11-screen/x11-screen.pkg b/src/x11-screen/x11-screen.pkg
index 7bc00f794..064402534 100644
--- a/src/x11-screen/x11-screen.pkg
+++ b/src/x11-screen/x11-screen.pkg
@@ -53,6 +53,9 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 	  x-make-special-key)
   (import (edwin x11-commands)
 	  update-xterm-screen-names!)
+  (import (edwin)
+	  os/interprogram-cut
+	  os/interprogram-paste)
   (import (x11)
 	  x-change-property
 	  x-close-all-displays