Index: Source/NSWindow.m
===================================================================
--- Source/NSWindow.m	(revision 25497)
+++ Source/NSWindow.m	(working copy)
@@ -2614,7 +2614,7 @@
   if (!_f.is_miniaturized)
     return;
 
-#if 0
+//#if 0
   /* At least with X-Windows, the counterpart is tied to us, so it will
      automatically be ordered out when we are deminiaturized */
   if (_counterpart != 0)
@@ -2623,7 +2623,7 @@
 
       [mini orderOut: self];
     }
-#endif
+//#endif
   _f.is_miniaturized = NO;
   [self makeKeyAndOrderFront: self];
   [self _didDeminiaturize: sender];
@@ -2692,7 +2692,7 @@
       [mini setContentView: v];
       RELEASE(v);
     }
-  [self _lossOfKeyOrMainWindow];
+  [self orderOut];
   [srv miniwindow: _windowNum];
   _f.visible = NO;