Define local read-and-eval! in emacs interface.

diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 8c27379..26d7fd9 100644 (file)
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-17  Neil Jerram  <neil@ossau.uklinux.net>
+
+       * emacs.scm (emacs-load): Locally define `read-and-eval!', as it
+       has been removed from the core.
+
 2002-11-16  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
        * syncase.scm (define-syntax, eval-when, fluid-let-syntax,

diff --git a/ice-9/emacs.scm b/ice-9/emacs.scm
index 7673d52..d124cd1 100644 (file)
--- a/ice-9/emacs.scm
+++ b/ice-9/emacs.scm
@@ -150,6 +150,11 @@
           #t)))
 
 (define (emacs-load filename linum colnum module interactivep)
+  (define (read-and-eval! port)
+    (let ((x (read port)))
+      (if (eof-object? x)
+         (throw 'end-of-file)
+         (primitive-eval x))))
   (set-port-filename! %%load-port filename)
   (set-port-line! %%load-port linum)
   (set-port-column! %%load-port colnum)