diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2007-03-22 14:57:13 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2007-03-22 14:57:13 +0000 |
| commit | 7f70e147d01d933bbefdc8863e1ea0b8b1ab386c (patch) | |
| tree | 8a1ff102175fbbe447b024bb589a50f8707153b8 | |
| parent | 96356799d2d64464fff3d3db8145be45103a3f63 (diff) | |
| download | emacs-7f70e147d01d933bbefdc8863e1ea0b8b1ab386c.tar.gz emacs-7f70e147d01d933bbefdc8863e1ea0b8b1ab386c.tar.bz2 emacs-7f70e147d01d933bbefdc8863e1ea0b8b1ab386c.zip | |
(EmacsFrameSetCharSize): Catch X errors.
| -rw-r--r-- | src/widget.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/widget.c b/src/widget.c index c6ba3be468b..e6388a7d158 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 |