From 3a89754d6af69fdb10779099fbfa18f1c34654a8 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 1 Aug 2011 04:01:40 -0600
Subject: [PATCH] fix mismatch between `make-base-eval' and
 `make-base-eval-factory'

original commit: 8d3aa69e9de7531f7b10f1f7c6c684be32978022
---
 collects/scribble/eval.rkt | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/collects/scribble/eval.rkt b/collects/scribble/eval.rkt
index 63f22602..ccda42d4 100644
--- a/collects/scribble/eval.rkt
+++ b/collects/scribble/eval.rkt
@@ -3,6 +3,7 @@
 (require "manual.rkt" "struct.rkt" "scheme.rkt" "decode.rkt"
          racket/string racket/list racket/file
          racket/sandbox racket/promise racket/port file/convertible
+         racket/gui/dynamic
          (for-syntax racket/base))
 
 (provide interaction
@@ -299,7 +300,12 @@
          e)))))
 
 (define (make-base-eval-factory mod-paths)
-  (let ([ns (delay (let ([ns (make-base-empty-namespace)])
+  (let ([ns (delay (let ([ns 
+                          ;; This namespace-creation choice needs to be consistent
+                          ;; with the sandbox (i.e., with `make-base-eval')
+                          (if gui?
+                              ((gui-dynamic-require 'make-gui-empty-namespace))
+                              (make-base-empty-namespace))])
                      (parameterize ([current-namespace ns])
                        (for ([mod-path (in-list mod-paths)])
                          (dynamic-require mod-path #f)))
@@ -307,22 +313,22 @@
     (lambda ()
       (let ([ev (make-base-eval)]
             [ns (force ns)])
-        ((scribble-eval-handler)
-         ev #f
-         `(,(lambda ()
-              (for ([mod-path (in-list mod-paths)])
-                (namespace-attach-module ns mod-path)))))
+        (call-in-sandbox-context
+         ev
+         (lambda ()
+           (for ([mod-path (in-list mod-paths)])
+             (namespace-attach-module ns mod-path))))
         ev))))
 
 (define (make-eval-factory mod-paths)
   (let ([base-factory (make-base-eval-factory mod-paths)])
     (lambda ()
       (let ([ev (base-factory)])
-        ((scribble-eval-handler)
-         ev #f
-         `(,(lambda ()
-              (for ([mod-path (in-list mod-paths)])
-                (namespace-require mod-path)))))
+        (call-in-sandbox-context
+         ev
+         (lambda ()
+           (for ([mod-path (in-list mod-paths)])
+             (namespace-require mod-path))))
         ev))))
 
 (define (close-eval e)