From c8cbc555e5c7e1203b862441da3ae769aa108c8b Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 30 May 2008 14:21:22 +0000
Subject: [PATCH] fix HtDP executables (PR 9158)

svn: r10037
---
 collects/lang/htdp-reader.ss | 4 +++-
 collects/wxme/wxme.ss        | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/collects/lang/htdp-reader.ss b/collects/lang/htdp-reader.ss
index eca905f09f..0afea114d6 100644
--- a/collects/lang/htdp-reader.ss
+++ b/collects/lang/htdp-reader.ss
@@ -30,7 +30,9 @@
              (let* ([table (read port)]
                     [path (object-name port)]
                     [modname 
-                     (if path
+                     (if (or (path? path)
+                             (and (string? path)
+                                  (path-string? path)))
                          (let-values ([(base name dir) (split-path path)])
                            (string->symbol (path->string (path-replace-suffix name #""))))
                          (lookup 'modname table))])
diff --git a/collects/wxme/wxme.ss b/collects/wxme/wxme.ss
index 7ba77c2481..23fe02dde7 100644
--- a/collects/wxme/wxme.ss
+++ b/collects/wxme/wxme.ss
@@ -6,6 +6,7 @@
            mzlib/class
            mzlib/contract
            mzlib/list
+           scheme/gui/dynamic
            "image.ss"
            "editor.ss"
            "private/compat.ss")
@@ -662,9 +663,7 @@
     (wxme-convert-port port close? #f))
 
   (define (do-read port who read)
-    (let ([port (if (with-handlers ([exn:fail? (lambda (x) #f)])
-                      (dynamic-require '#%mred-kernel #f)
-                      #t)
+    (let ([port (if (gui-available?)
                     ;; GUI mode, since MrEd is available:
                     (let ([text% (dynamic-require 'mred 'text%)]
                           [open-input-text-editor (dynamic-require 'mred 'open-input-text-editor)])