summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>1993-03-24 01:54:20 +0000
committerJim Blandy <jimb@redhat.com>1993-03-24 01:54:20 +0000
commit6afb1d07c238306fd75c6141ac0d565559a4ff3a (patch)
tree9c65ed622588165e16668aeb856409ffdca26281 /src
parente6b01c14b7ccb0a0cdf8cb80a50061464a4a1876 (diff)
downloademacs-6afb1d07c238306fd75c6141ac0d565559a4ff3a.tar.gz
* 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.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 57e756c32be..796231c64dd 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1742,6 +1742,8 @@ x_make_gc (f)
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 @@ x_make_gc (f)
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 @@ select_visual (screen, depth)
#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,