Thanks to Mikael Djurfeldt for a bugreport which led to the

following changes:

* slib.scm (%system-define): Removed.

(define): Changed to use define-private instead of
%system-define.

* boot-9.scm (define-private): Undid my changes from 2002-11-16
until Guile supports hygienic macros.

3 files changed, 17 insertions, 5 deletions

diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 26d7fd9d8..56b7e8891 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,16 @@
+2002-11-24  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+	Thanks to Mikael Djurfeldt for a bugreport which led to the
+	following changes:
+
+	* slib.scm (%system-define): Removed.
+
+	(define): Changed to use define-private instead of
+	%system-define.
+
+	* boot-9.scm (define-private): Undid my changes from 2002-11-16
+	until Guile supports hygienic macros.
+
 2002-11-17  Neil Jerram  <neil@ossau.uklinux.net>
 
 	* emacs.scm (emacs-load): Locally define `read-and-eval!', as it
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index f470020cf..7b07a6239 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -2591,8 +2591,9 @@
     (else
      (error "use-syntax can only be used at the top level"))))
 
-(defmacro define-private args
-  `(define ,@args))
+;; Dirk:FIXME:: This incorrect (according to R5RS) syntax needs to be changed
+;; as soon as guile supports hygienic macros.
+(define define-private define)
 
 (defmacro define-public args
   (define (syntax)
diff --git a/ice-9/slib.scm b/ice-9/slib.scm
index cde54c339..8b96989ee 100644
--- a/ice-9/slib.scm
+++ b/ice-9/slib.scm
@@ -269,14 +269,12 @@
 (define offset-time +)
 
 
-(define %system-define define)
-
 (define define
   (procedure->memoizing-macro
    (lambda (exp env)
      (if (= (length env) 1)
 	 `(define-public ,@(cdr exp))
-	 `(%system-define ,@(cdr exp))))))
+	 `(define-private ,@(cdr exp))))))
 
 ;;; Hack to make syncase macros work in the slib module
 (if (nested-ref the-root-module '(app modules ice-9 syncase))