(Fset_text_properties): Fix newline in doc string.

[gnu-emacs] / src / frame.c

diff --git a/src/frame.c b/src/frame.c
index fae6f8c7b3d3063406082c1c0a153e2d7d2a7efe..204eec30830180b9ee235cf49d12fcb5f6b7a8b3 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -620,6 +620,9 @@ do_switch_frame (frame, no_enter, track)
 #endif /* HAVE_X_WINDOWS */
 #endif /* ! 0 */
 
+  if (FRAME_HAS_MINIBUF_P (sf))
+    resize_mini_window (XWINDOW (FRAME_MINIBUF_WINDOW (sf)), 1);
+
   selected_frame = frame;
   if (! FRAME_MINIBUF_ONLY_P (XFRAME (selected_frame)))
     last_nonminibuf_frame = XFRAME (selected_frame);
@@ -1071,7 +1074,13 @@ frame.  The hook is called with one argument FRAME.")
   if (! FRAME_LIVE_P (f))
     return Qnil;
 
-  if (NILP (force) && !other_visible_frames (f))
+  if (NILP (force) && !other_visible_frames (f)
+#ifdef macintosh
+      /* Terminal frame deleted before any other visible frames are
+        created.  */
+      && strcmp (XSTRING (f->name)->data, "F1") != 0
+#endif
+     )
     error ("Attempt to delete the sole visible or iconified frame");
 
 #if 0