[Emacs-diffs] Changes to emacs/src/widget.c,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/03/22 14:57:13

Index: widget.c
===================================================================
RCS file: /sources/emacs/emacs/src/widget.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- widget.c    14 Jan 2007 03:24:37 -0000      1.75
+++ widget.c    22 Mar 2007 14:57:13 -0000      1.76
@@ -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, address@hidden 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