# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 732938060 0
# Node ID 1982e2983822ec434b67cae42ff351eec96d2eea
# Parent  f19f4582c04d9819b7e6a34e4ba4b493031e800a
	* xfns.c (x_make_gc): Don't forget to block X input around the
	X calls in this function.

	* xfns.c [not HAVE_X11R4] (select_visual): It's v->visualid, not
	x->visualid.  x isn't defined.

diff -r f19f4582c04d -r 1982e2983822 src/xfns.c
--- a/src/xfns.c	Wed Mar 24 01:53:00 1993 +0000
+++ b/src/xfns.c	Wed Mar 24 01:54:20 1993 +0000
@@ -1742,6 +1742,8 @@
   GC temp_gc;
   XImage tileimage;
 
+  BLOCK_INPUT;
+
   /* Create the GC's of this frame.
      Note that many default values are used. */
 
@@ -1788,6 +1790,8 @@
 	f->display.x->foreground_pixel,
 	f->display.x->background_pixel,
 	DefaultDepth (x_current_display, XDefaultScreen (x_current_display))));
+
+  UNBLOCK_INPUT;
 }
 #endif /* HAVE_X11 */
 
@@ -3721,7 +3725,7 @@
 #ifdef HAVE_X11R4
   vinfo_template.visualid = XVisualIDFromVisual (v);
 #else
-  vinfo_template.visualid = x->visualid;
+  vinfo_template.visualid = v->visualid;
 #endif
 
   vinfo = XGetVisualInfo (x_current_display, VisualIDMask, &vinfo_template,