From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Sun, 16 Sep 2018 22:12:04 +0000 (-0700)
Subject: Fix Edwin to recognize the x11-screen option during testing.
X-Git-Tag: mit-scheme-pucked-9.2.18~7^2~3
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=2f10c078ade9ebe8bc80be0a8c3f243ca9b4b2cd;p=mit-scheme.git

Fix Edwin to recognize the x11-screen option during testing.
---

diff --git a/src/edwin/xterm.scm b/src/edwin/xterm.scm
index fc741bc6f..731155fa7 100644
--- a/src/edwin/xterm.scm
+++ b/src/edwin/xterm.scm
@@ -38,9 +38,14 @@ USA.
      (and (let ((display (get-environment-variable "DISPLAY")))
 	    (and (string? display)
 		 (not (string-null? display))))
-	  (let ((dirpath (system-library-directory-pathname "x11-screen/")))
-	    (and dirpath
-		 (file-directory? dirpath)))))
+	  (or (let ((dirpath (system-library-directory-pathname "x11-screen/")))
+		(and dirpath
+		     (file-directory? dirpath)))
+	      ;; The subsystem is on the library path (not in a subdirectory on
+	      ;; the path) when testing.
+	      (let ((filepath (system-library-pathname "x11-screen.bin" #f)))
+		(and filepath
+		     (file-loadable? filepath))))))
    (named-lambda (make-x11-screen #!optional geometry)
      (load-option-quietly 'x11-screen)
      (make-xterm-screen geometry))
diff --git a/src/x11-screen/x11-screen-check.sh b/src/x11-screen/x11-screen-check.sh
index 00ec66b91..1fcd946f4 100755
--- a/src/x11-screen/x11-screen-check.sh
+++ b/src/x11-screen/x11-screen-check.sh
@@ -11,7 +11,6 @@ ${MIT_SCHEME_EXE} --prepend-library . <<\EOF
 	    (string-null? display)))
       (warn "DISPLAY not set")
       (let ((edwin (->environment '(edwin))))
-	(load-option 'X11-SCREEN)
 	(set! (access os/init-file-name edwin)
 	      (let ((pathname (merge-pathnames "x11-screen-test.scm")))
 		(named-lambda (os/init-file-name/x11-screen-test)