From e3d13813aaac35a4db6844343a4f8072b79b3eb0 Mon Sep 17 00:00:00 2001
From: Robin Templeton <robin@terpri.org>
Date: Sun, 10 May 2015 17:11:28 -0400
Subject: [PATCH] use standard evaluator

(Best-ability ChangeLog annotation added by Christopher Allan Webber.)

* module/language/elisp/compile-tree-il.scm: Remove import of
  "(language tree-il eval)".
  (defmacro): Use standard "eval".
* module/language/elisp/runtime.scm: Remove import of "(language tree-il eval)".
---
 module/language/elisp/compile-tree-il.scm | 3 +--
 module/language/elisp/runtime.scm         | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/module/language/elisp/compile-tree-il.scm b/module/language/elisp/compile-tree-il.scm
index 3e4f74b15..629514569 100644
--- a/module/language/elisp/compile-tree-il.scm
+++ b/module/language/elisp/compile-tree-il.scm
@@ -30,7 +30,6 @@
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 format)
-  #:use-module (language tree-il eval)
   #:export (compile-tree-il
             compile-progn
             compile-eval-when-compile
@@ -787,7 +786,7 @@
                                           body))))
                   (make-const loc name))))
            (when (fluid-ref toplevel?)
-             (eval-tree-il tree-il))
+             (eval tree-il (current-module)))
            tree-il)))
     (else (report-error loc "bad defmacro" args))))
 
diff --git a/module/language/elisp/runtime.scm b/module/language/elisp/runtime.scm
index c8c39bf95..bf5b36929 100644
--- a/module/language/elisp/runtime.scm
+++ b/module/language/elisp/runtime.scm
@@ -22,7 +22,6 @@
   #:use-module (ice-9 format)
   #:use-module ((system base compile)
                 #:select (compile))
-  #:use-module (language tree-il eval)
   #:export (nil-value
             t-value
             value-slot-module