(Fx_close_current_connection): Clear x_current_display.

(Fx_list_fonts): Use CHECK_LIVE_FRAME on the frame arg.

(x_figure_window_size): Never set PPosition or PSize.

1 files changed, 11 insertions, 5 deletions

diff --git a/src/xfns.c b/src/xfns.c
index 95932dbe345..4ff2e1ab5c8 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1415,10 +1415,10 @@ x_figure_window_size (f, parms)
   else if (! EQ (tem0, Qunbound) || ! EQ (tem1, Qunbound))
     error ("Must specify *both* height and width");
 
-  f->display.x->vertical_scroll_bar_extra =
-    (FRAME_HAS_VERTICAL_SCROLL_BARS (f)
-     ? VERTICAL_SCROLL_BAR_PIXEL_WIDTH (f)
-     : 0);
+  f->display.x->vertical_scroll_bar_extra
+    = (FRAME_HAS_VERTICAL_SCROLL_BARS (f)
+       ? VERTICAL_SCROLL_BAR_PIXEL_WIDTH (f)
+       : 0);
   f->display.x->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
   f->display.x->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);
 
@@ -1436,6 +1436,9 @@ x_figure_window_size (f, parms)
   else if (! EQ (tem0, Qunbound) || ! EQ (tem1, Qunbound))
     error ("Must specify *both* top and left corners");
 
+#if 0 /* PPosition and PSize mean "specified explicitly,
+         by the program rather than by the user".  So it is wrong to
+         set them if nothing was specified.  */
   switch (window_prompting)
     {
     case USSize | USPosition:
@@ -1462,6 +1465,8 @@ x_figure_window_size (f, parms)
          put there.  */
       abort ();
     }
+#endif
+  return window_prompting;
 }
 
 static void
@@ -2170,7 +2175,7 @@ fonts), even if they match PATTERN and FACE.")
   if (!NILP (face))
     CHECK_SYMBOL (face, 1);
   if (!NILP (frame))
-    CHECK_SYMBOL (frame, 2);
+    CHECK_LIVE_FRAME (frame, 2);
 
   if (NILP (face))
     size_ref = 0;
@@ -3506,6 +3511,7 @@ DEFUN ("x-close-current-connection", Fx_close_current_connection,
       BLOCK_INPUT;
       XSetCloseDownMode (x_current_display, DestroyAll);
       XCloseDisplay (x_current_display);
+      x_current_display = 0;
     }
   else
     fatal ("No current X display connection to close\n");