From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 8 Mar 1994 20:24:33 +0000 (+0000)
Subject: * Change definitions of and references to *PREVIOUS-POPPED-UP-WINDOW*,
X-Git-Tag: 20090517-FFI~7255
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=99e1b0945898e7995e3baf0b602ba290b6c6a10d;p=mit-scheme.git

* Change definitions of and references to *PREVIOUS-POPPED-UP-WINDOW*,
  *PREVIOUS-POPPED-UP-BUFFER*, and *MINIBUFFER-SCROLL-WINDOW*; they
  are now bound to weak pairs instead of hash numbers.
---

diff --git a/v7/src/edwin/buffrm.scm b/v7/src/edwin/buffrm.scm
index faa7ae930..d995b0ec1 100644
--- a/v7/src/edwin/buffrm.scm
+++ b/v7/src/edwin/buffrm.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: buffrm.scm,v 1.48 1993/08/10 05:42:07 cph Exp $
+;;;	$Id: buffrm.scm,v 1.49 1994/03/08 20:24:23 cph Exp $
 ;;;
-;;;	Copyright (c) 1986, 1989-93 Massachusetts Institute of Technology
+;;;	Copyright (c) 1986, 1989-94 Massachusetts Institute of Technology
 ;;;
 ;;;	This material was developed by the Scheme project at the
 ;;;	Massachusetts Institute of Technology, Department of
@@ -415,7 +415,7 @@ Automatically becomes local when set in any fashion."
        (let ((window (editor-frame-cursor-window frame)))
 	 (and (not (eq? window selected-window))
 	      (converted-window window)))
-       (let ((window (object-unhash *minibuffer-scroll-window*)))
+       (let ((window (weak-car *minibuffer-scroll-window*)))
 	 (and window
 	      (converted-window window)))))))
 
@@ -494,7 +494,5 @@ Automatically becomes local when set in any fashion."
 		   (window-configuration/minibuffer-scroll-window
 		    configuration)))
 	      (if window
-		  (begin
-		    (set! *minibuffer-scroll-window*
-			  (hash (convert-window window)))
-		    unspecific))))))))
\ No newline at end of file
+		  (weak-set-car! *minibuffer-scroll-window*
+				 (convert-window window)))))))))
\ No newline at end of file
diff --git a/v7/src/edwin/editor.scm b/v7/src/edwin/editor.scm
index 3fd012cb9..06c2e77eb 100644
--- a/v7/src/edwin/editor.scm
+++ b/v7/src/edwin/editor.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: editor.scm,v 1.234 1993/11/18 15:11:36 gjr Exp $
+;;;	$Id: editor.scm,v 1.235 1994/03/08 20:24:33 cph Exp $
 ;;;
-;;;	Copyright (c) 1986, 1989-1993 Massachusetts Institute of Technology
+;;;	Copyright (c) 1986, 1989-94 Massachusetts Institute of Technology
 ;;;
 ;;;	This material was developed by the Scheme project at the
 ;;;	Massachusetts Institute of Technology, Department of
@@ -230,8 +230,9 @@ with the contents of the startup message."
 	   (set! edwin-editor false)
 	   (set! edwin-continuation)
 	   (set! init-file-loaded? false)
-	   (set! *previous-popped-up-buffer* (object-hash false))
-	   (set! *previous-popped-up-window* (object-hash false))
+	   (weak-set-car! *previous-popped-up-window* #f)
+	   (weak-set-car! *previous-popped-up-buffer* #f)
+	   (weak-set-car! *minibuffer-scroll-window* #f)
 	   unspecific)))))
 
 (define (reset-editor-windows)