From 6d3470be25d2810e0dbc2924a5e4b479cc4da522 Mon Sep 17 00:00:00 2001
From: eknauel <eknauel>
Date: Tue, 27 Sep 2005 16:36:30 +0000
Subject: [PATCH] Move inspector-handler from eval-s... to callers

part of darcs patch Thu Sep 22 19:55:01 EEST 2005  Martin Gasbichler <gasbichl@informatik.uni-tuebingen.de>
---
 scheme/eval-environment.scm | 10 +++-------
 scheme/nuit-engine.scm      |  9 +++++++--
 scheme/nuit-packages.scm    |  4 +---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/scheme/eval-environment.scm b/scheme/eval-environment.scm
index 10ac017..0bc6578 100644
--- a/scheme/eval-environment.scm
+++ b/scheme/eval-environment.scm
@@ -17,13 +17,9 @@
     (read string-port)))
 
 (define (eval-string str)
-  (with-inspector-handler
-   (lambda ()
-     (eval (read-sexp-from-string str)
-           (evaluation-environment)))))
+  (eval (read-sexp-from-string str)
+        (evaluation-environment)))
 
 (define (eval-s-expr s-expr)
-  (with-inspector-handler
-   (lambda ()
-     (eval s-expr (evaluation-environment)))))
+  (eval s-expr (evaluation-environment)))
 
diff --git a/scheme/nuit-engine.scm b/scheme/nuit-engine.scm
index 2ce3627..2d7cb43 100644
--- a/scheme/nuit-engine.scm
+++ b/scheme/nuit-engine.scm
@@ -236,7 +236,10 @@
 	    (command-plugin (find-command-plugin command))
 	    (viewer
 	     (find/init-plugin-for-result
-              ((command-plugin-evaluater command-plugin) command args)))
+              (with-inspector-handler
+               (lambda ()
+                 ((command-plugin-evaluater command-plugin)
+                  command args)))))
 	    (new-entry
 	     (make-history-entry command args viewer)))
        ;; FIXME, use insert here
@@ -290,7 +293,9 @@
       (process-scheme-command command-line)
       (let* ((viewer
               (find/init-plugin-for-result
-               (eval-string command-line)))
+               (with-inspector-handler
+                (lambda ()
+                  (eval-string command-line)))))
              (new-entry
               (make-history-entry command-line '() viewer)))
         ;; #### shouldn't we use some kind of insertion here?
diff --git a/scheme/nuit-packages.scm b/scheme/nuit-packages.scm
index 03dab5d..6027a25 100644
--- a/scheme/nuit-packages.scm
+++ b/scheme/nuit-packages.scm
@@ -296,6 +296,7 @@
 	joblist
 	jobs
 	run-jobs-internals
+        eval-environment
 	layout
         fs-object
 	pps
@@ -501,7 +502,6 @@
   (open scheme
         srfi-6
 
-	inspection-objects
         rt-modules)
   (files eval-environment))
 
@@ -741,8 +741,6 @@
 
 (define-interface run-jobs-internals-interface
   (export
-   eval-string
-   eval-s-expr
    run/console*
    run/fg*
    run/bg*))