Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-674
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-675
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-676
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-677
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-678
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-679
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-680
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-681
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-682
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-683
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-684
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-685
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-686
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-687
   Release ERC 5.2.

 * emacs@sv.gnu.org/emacs--devo--0--patch-688
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-689
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-690
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-691
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-692
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-693
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-694
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-695
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-696
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-697
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-698
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-699
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-700
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-701
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-209
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-210
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-211
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-212
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-213
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-214
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-215
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-601

1 files changed, 5 insertions, 0 deletions

diff --git a/src/widget.c b/src/widget.c
index 883be9a23f4..bcb038340a5 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -953,9 +953,11 @@ EmacsFrameSetCharSize (widget, columns, rows)
          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 @@ EmacsFrameSetCharSize (widget, columns, rows)
          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 @@ EmacsFrameSetCharSize (widget, columns, rows)
                      XtNheight, (XtArgVal) pixel_height,
                      XtNwidth, (XtArgVal) pixel_width,
                      NULL);
+      x_uncatch_errors ();
+
 #ifdef SIGIO
       sigunblock (sigmask (SIGIO));
 #endif