Racket: eval geiser-eval's apply arguments properly

As Stanisław Halik reported, autodoc was receiving a mlist (instead of
a list) as its argument when invoked in an R5RS context.  Turns out we
were evaluating geiser-eval's arguments in the wrong context (the
procedure being applied and the arglist belong to the same namespace).

1 files changed, 5 insertions, 3 deletions

diff --git a/scheme/racket/geiser/user.rkt b/scheme/racket/geiser/user.rkt
index 621b47f..4479b42 100644
--- a/scheme/racket/geiser/user.rkt
+++ b/scheme/racket/geiser/user.rkt
@@ -50,15 +50,17 @@
 
 (define (geiser-eval)
   (define geiser-main (module->namespace 'geiser))
+  (define (eval-here form) (eval form geiser-main))
   (let* ([mod (read)]
          [lang (read)]
          [form (read)])
     (datum->syntax #f
                    (list 'quote
                          (cond [(equal? form '(unquote apply))
-                                (let* ([proc (eval (read) geiser-main)]
-                                       [args (read)])
-                                  (eval-in `(,proc ,@args) mod lang))]
+                                (let* ([proc (eval-here (read))]
+                                       [args (map eval-here (read))]
+                                       [ev (lambda () (apply proc args))])
+                                  (eval-in `(,ev) mod lang))]
                                [else ((geiser:eval lang) form mod)])))))
 
 (define ((geiser-read prompt))