From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Sun, 29 May 2016 17:02:40 +0000 (-0700)
Subject: x11-screen.scm: Fix DISPLAY test.
X-Git-Tag: mit-scheme-pucked-9.2.12~261^2~35
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=ae55ac91dc79db97b665fdd7daaaf5bcfe7f51ac;p=mit-scheme.git

x11-screen.scm: Fix DISPLAY test.
---

diff --git a/src/x11-screen/x11-screen.scm b/src/x11-screen/x11-screen.scm
index b5bb4e1ac..bc198af52 100644
--- a/src/x11-screen/x11-screen.scm
+++ b/src/x11-screen/x11-screen.scm
@@ -1314,7 +1314,10 @@ Otherwise, it is copied from the primary selection."
   ;; X-OPEN-DISPLAY hangs, uninterruptibly, when the X server is
   ;; running the login loop of xdm.  Can this be fixed?
   (or x-display-data
-      (and (or x-display-name (get-environment-variable "DISPLAY"))
+      (and (or x-display-name
+	       (let ((DISPLAY (get-environment-variable "DISPLAY")))
+		 (and (string? DISPLAY)
+		      (not (string-null? DISPLAY)))))
 	   (plugin-available? "x11")
 	   (begin
 	     (load-option 'X11)