From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 7 Dec 2000 16:07:03 +0000 (+0000)
Subject: Fix some bad interactions between buffer layouts and popped-up
X-Git-Tag: 20090517-FFI~3122
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=e3af25dbc6fe55f4a68c5d0a2c5598d627cfd7a2;p=mit-scheme.git

Fix some bad interactions between buffer layouts and popped-up
windows.
---

diff --git a/v7/src/edwin/wincom.scm b/v7/src/edwin/wincom.scm
index 41b382ae9..6ea1291cc 100644
--- a/v7/src/edwin/wincom.scm
+++ b/v7/src/edwin/wincom.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: wincom.scm,v 1.131 2000/12/01 06:07:43 cph Exp $
+;;; $Id: wincom.scm,v 1.132 2000/12/07 16:07:03 cph Exp $
 ;;;
 ;;; Copyright (c) 1987, 1989-2000 Massachusetts Institute of Technology
 ;;;
@@ -451,7 +451,7 @@ Also kills any pop up window it may have created."
 	    (lambda (window)
 	      (let ((entry (weak-assq window *pop-up-buffer-window-alist*)))
 		(if entry
-		    (set-window-buffer! window (weak-cdr entry)))))
+		    (select-buffer-no-record (weak-cdr entry) window))))
 	    (buffer-windows buffer))
 	   (weak-set-car! *previous-popped-up-buffer* #f)
 	   (kill-buffer-interactive buffer))
@@ -544,7 +544,6 @@ Also kills any pop up window it may have created."
 	  (let ((limit (* 2 (ref-variable window-min-height))))
 	    (if (< (ref-variable split-height-threshold) limit)
 		(set-variable! split-height-threshold limit))
-	    (maybe-deselect-buffer-layout screen)
 	    (cond ((and (use-multiple-screens?)
 			(other-screen screen))
 		   => (lambda (screen)