Changeset 247

Timestamp:

11/14/02 16:35:31 (21 years ago)

Author:

piso

Message:

unsplitInternal(): promote secondary buffer in editor being killed too.

File:

• trunk/j/src/org/armedbear/j/Frame.java (modified) (4 diffs)

trunk/j/src/org/armedbear/j/Frame.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: Frame.java,v 1.2 2002-10-13 16:56:02 piso Exp $
+ * $Id: Frame.java,v 1.3 2002-11-14 16:35:31 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -467 +467 @@
     public void switchToBuffer(final Buffer buf)
     {
-        Debug.assertTrue(buf.isPaired() ||
+        Debug.bugIfNot(buf.isPaired() ||
             (getEditorCount() == 2 && editors[0].getBuffer().isPaired()));
         final Buffer primary;
@@ -696 +696 @@
     }
 
-    private void unsplitInternal(Editor keep, Editor kill)
+    private void unsplitInternal(final Editor keep, final Editor kill)
     {
         Editor.getSessionProperties().saveSidebarState(this);
@@ -715 +715 @@
         editors[1] = null;
         Buffer buffer = keep.getBuffer();
+        if (buffer.isSecondary())
+            buffer.promote();
+        buffer = kill.getBuffer();
         if (buffer.isSecondary())
             buffer.promote();