Store macro definitions in environments rather than in syntax tables.

diff --git a/v7/src/edwin/edwin.ldr b/v7/src/edwin/edwin.ldr
index 4d81069074d7bab27747a1c1361309ea128fe7fa..1ed58b8e9f66bd1a717a2b1c1c96c0d10b6b6814 100644 (file)
--- a/v7/src/edwin/edwin.ldr
+++ b/v7/src/edwin/edwin.ldr
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: edwin.ldr,v 1.72 2000/06/15 00:58:55 cph Exp $
+$Id: edwin.ldr,v 1.73 2001/12/22 04:00:33 cph Exp $
 
-Copyright (c) 1989-2000 Massachusetts Institute of Technology
+Copyright (c) 1989-2001 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
 |#
 
 ;;; program to load package contents
@@ -81,8 +82,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
        (load "strtab" environment)
        (load "strpad" environment)
        (load "macros" (->environment '(EDWIN MACROS)))
-       (set-environment-syntax-table! environment
-                                      (access edwin-syntax-table environment))
        (load "class" environment)
        (load "clscon" (->environment '(EDWIN CLASS-CONSTRUCTOR)))
        (load "clsmac" (->environment '(EDWIN CLASS-MACROS)))

diff --git a/v7/src/edwin/macros.scm b/v7/src/edwin/macros.scm
index f8d41843815b5662f5c399b8481e9f780128fc74..5f0f20bf4e6e7ac9729692ad7d271338892dcd2b 100644 (file)
--- a/v7/src/edwin/macros.scm
+++ b/v7/src/edwin/macros.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: macros.scm,v 1.68 2001/12/21 18:41:22 cph Exp $
+;;; $Id: macros.scm,v 1.69 2001/12/22 04:00:39 cph Exp $
 ;;;
-;;; Copyright (c) 1986, 1989-1999 Massachusetts Institute of Technology
+;;; Copyright (c) 1986, 1989-1999, 2001 Massachusetts Institute of Technology
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
@@ -16,7 +16,8 @@
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;;; 02111-1307, USA.
 
 ;;;; Editor Macros