*** empty log message ***

[bpt/guile.git] / ice-9 / slib.scm

diff --git a/ice-9/slib.scm b/ice-9/slib.scm
index 44fbdf6..c7d3af5 100644 (file)
--- a/ice-9/slib.scm
+++ b/ice-9/slib.scm
@@ -1,23 +1,47 @@
 ;;;; slib.scm --- definitions needed to get SLIB to work with Guile
 ;;;;
-;;;;   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
 ;;;;
-;;;;   This file is part of GUILE.
-;;;;   
-;;;;   GUILE is free software; you can redistribute it and/or modify
-;;;;   it under the terms of the GNU General Public License as
-;;;;   published by the Free Software Foundation; either version 2, or
-;;;;   (at your option) any later version.
-;;;;   
-;;;;   GUILE is distributed in the hope that it will be useful, but
-;;;;   WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;;   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;;   GNU General Public License for more details.
-;;;;   
-;;;;   You should have received a copy of the GNU General Public
-;;;;   License along with GUILE; see the file COPYING.  If not, write
-;;;;   to the Free Software Foundation, Inc., 59 Temple Place, Suite
-;;;;   330, Boston, MA 02111-1307 USA
+;;;; This file is part of GUILE.
+;;;; 
+;;;; GUILE is free software; you can redistribute it and/or modify it
+;;;; under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your
+;;;; option) any later version.
+;;;; 
+;;;; GUILE is distributed in the hope that it will be useful, but
+;;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;;; General Public License for more details.
+;;;; 
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with GUILE; see the file COPYING.  If not, write to the
+;;;; Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+;;;; Boston, MA 02111-1307 USA
+;;;;
+;;;; As a special exception, the Free Software Foundation gives permission
+;;;; for additional uses of the text contained in its release of GUILE.
+;;;;
+;;;; The exception is that, if you link the GUILE library with other files
+;;;; to produce an executable, this does not by itself cause the
+;;;; resulting executable to be covered by the GNU General Public License.
+;;;; Your use of that executable is in no way restricted on account of
+;;;; linking the GUILE library code into it.
+;;;;
+;;;; This exception does not however invalidate any other reasons why
+;;;; the executable file might be covered by the GNU General Public License.
+;;;;
+;;;; This exception applies only to the code released by the
+;;;; Free Software Foundation under the name GUILE.  If you copy
+;;;; code from other Free Software Foundation releases into a copy of
+;;;; GUILE, as the General Public License permits, the exception does
+;;;; not apply to the code that you add in this way.  To avoid misleading
+;;;; anyone as to the status of such modified files, you must delete
+;;;; this exception notice from them.
+;;;;
+;;;; If you write modifications of your own for GUILE, it is your choice
+;;;; whether to permit this exception to apply to your modifications.
+;;;; If you do not wish that, delete this exception notice.
 ;;;;
 (define-module (ice-9 slib)
   :no-backtrace)
@@ -41,8 +65,8 @@
 (define slib:exit quit)
 (define slib:error error)
 (define slib:warn warn)
-(define slib:eval (lambda (x) (eval-in-module x slib-module)))
-(define defmacro:eval eval)
+(define slib:eval (lambda (x) (eval x slib-module)))
+(define defmacro:eval (lambda (x) (eval x (interaction-environment))))
 (define logical:logand logand)
 (define logical:logior logior)
 (define logical:logxor logxor)
@@ -162,7 +186,7 @@
 (define slib-parent-dir
   (let* ((path (%search-load-path "slib/require.scm")))
     (if path
-       (make-shared-substring path 0 (- (string-length path) 17))
+       (substring path 0 (- (string-length path) 17))
        (error "Could not find slib/require.scm in " %load-path))))
 
 (define-public (implementation-vicinity)