# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1174575433 0
# Node ID 8ee14c8d35045a114996428d89ab6322cf9fee4a
# Parent  fa4a70ff3ea7d5887ae1a76db1923d83d7803fab
(EmacsFrameSetCharSize): Catch X errors.

diff -r fa4a70ff3ea7 -r 8ee14c8d3504 src/widget.c
--- a/src/widget.c	Thu Mar 22 14:57:03 2007 +0000
+++ b/src/widget.c	Thu Mar 22 14:57:13 2007 +0000
@@ -953,9 +953,11 @@
 	 Xt when the default font is changed.  Tell Xt not to wait,
 	 depending on the value of the frame parameter
 	 `wait-for-wm'.  */
+      x_catch_errors (FRAME_X_DISPLAY (f));
       XtVaSetValues (f->output_data.x->widget,
 		     XtNwaitForWm, (XtArgVal) f->output_data.x->wait_for_wm,
 		     NULL);
+      x_uncatch_errors ();
 
       /* Workaround: When a SIGIO or SIGALRM occurs while Xt is
 	 waiting for a ConfigureNotify event (see above), this leads
@@ -972,6 +974,7 @@
 	 as is because I think it can't do any harm.  */
       /* In April 2002, simon.marshall@misys.com reports the problem
 	 seems not to occur any longer.  */
+      x_catch_errors (FRAME_X_DISPLAY (f));
       XtVaSetValues (f->output_data.x->widget,
       		     XtNheight, (XtArgVal) (outer_widget_height + hdelta),
 		     XtNwidth, (XtArgVal) (outer_widget_width + wdelta),
@@ -984,6 +987,8 @@
                      XtNheight, (XtArgVal) pixel_height,
       		     XtNwidth, (XtArgVal) pixel_width,
 		     NULL);
+      x_uncatch_errors ();
+
 #ifdef SIGIO
       sigunblock (sigmask (SIGIO));
 #endif