* 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 faa7ae9304f47b44bd17addd005b55a762a7bfa9..d995b0ec1fb302e409e02a2e2d27c8e70a24adb9 100644 (file)
--- 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)))))))
 \f
@@ -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 3fd012cb950154aa5dad940a2c14329407920b58..06c2e77ebf6e273ba3d94d136f747584029a046d 100644 (file)
--- 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)