From b23dafae674e7a23e56a1813a7f9bbae9113f295 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 19 Dec 2001 01:44:03 +0000
Subject: [PATCH] Rename references to SCode variable abstraction.  Eliminate
 special hack in "rename.scm"; instead use new packaging feature to link
 different names.

---
 v7/src/edwin/edwin.pkg  | 19 ++++++++++++-------
 v7/src/edwin/rename.scm | 23 ++++-------------------
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/v7/src/edwin/edwin.pkg b/v7/src/edwin/edwin.pkg
index 19d6415a9..253c36744 100644
--- a/v7/src/edwin/edwin.pkg
+++ b/v7/src/edwin/edwin.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: edwin.pkg,v 1.277 2001/12/18 22:23:26 cph Exp $
+$Id: edwin.pkg,v 1.278 2001/12/19 01:43:59 cph Exp $
 
 Copyright (c) 1989-2001 Massachusetts Institute of Technology
 
@@ -116,20 +116,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 	  edwin
 	  inhibit-editor-init-file?
 	  reset-editor
-	  reset-editor-windows))
+	  reset-editor-windows
+	  (save-editor-files debug-save-files)))
 
 (define-package (edwin class-macros)
   (files "clsmac")
-  (parent (edwin)))
+  (parent (edwin))
+  (import ()
+	  (make-scode-variable make-variable)
+	  (scode-variable-name variable-name)))
 
 (define-package (edwin class-macros transform-instance-variables)
   (files "xform")
   (parent (edwin class-macros))
   (export (edwin class-macros)
-	  transform-instance-variables)
-  (import ()
-	  (make-scode-variable make-variable)
-	  (scode-variable-name variable-name)))
+	  transform-instance-variables))
 
 (define-package (edwin class-constructor)
   (files "clscon")
@@ -322,6 +323,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 	  window-mark->y
 	  window-mark-visible?
 	  window-modeline-event!
+	  (window-needs-redisplay? buffer-frame-needs-redisplay?)
 	  window-override-message
 	  window-point
 	  window-point-coordinates
@@ -334,7 +336,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 	  window-select-time
 	  window-set-override-message!
 	  window-start-mark
+	  (window-x-size buffer-frame-x-size)
 	  window-y-center
+	  (window-y-size buffer-frame-y-size)
+	  (window? buffer-frame?)
 	  with-saved-configuration)
   (export (edwin screen)
 	  editor-frame-screen
diff --git a/v7/src/edwin/rename.scm b/v7/src/edwin/rename.scm
index e5636ec51..3026d6fbe 100644
--- a/v7/src/edwin/rename.scm
+++ b/v7/src/edwin/rename.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: rename.scm,v 1.7 1999/01/02 06:11:34 cph Exp $
+;;; $Id: rename.scm,v 1.8 2001/12/19 01:44:03 cph Exp $
 ;;;
-;;; Copyright (c) 1989-1999 Massachusetts Institute of Technology
+;;; Copyright (c) 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,25 +16,10 @@
 ;;;
 ;;; 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.
 
 ;;;; Edwin Interpackage Renames
 
 (declare (usual-integrations))
 
-(let ((global (->environment '()))
-      (edwin (->environment '(edwin)))
-      (window (->environment '(edwin window))))
-  (let ((g<-e
-	 (lambda (g e)
-	   (if (not (lexical-unreferenceable? edwin e))
-	       (local-assignment global g (lexical-reference edwin e))))))
-    (g<-e 'save-editor-files 'debug-save-files))
-  (let ((e<-w
-	 (lambda (e w)
-	   (if (not (lexical-unreferenceable? window w))
-	       (lexical-assignment edwin e (lexical-reference window w))))))
-    (e<-w 'window? 'buffer-frame?)
-    (e<-w 'window-x-size 'buffer-frame-x-size)
-    (e<-w 'window-y-size 'buffer-frame-y-size)
-    (e<-w 'window-needs-redisplay? 'buffer-frame-needs-redisplay?)))
\ No newline at end of file
-- 
2.25.1