(mouse-autoselect-window-cancel): Don't cancel for

[bpt/emacs.git] / src / widget.c

diff --git a/src/widget.c b/src/widget.c
index eaf8e66..714da20 100644 (file)
--- a/src/widget.c
+++ b/src/widget.c
@@ -1,11 +1,12 @@
 /* The emacs frame widget.
-   Copyright (C) 1992, 1993, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -15,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
@@ -758,7 +759,6 @@ EmacsFrameDestroy (widget)
 
   if (! s) abort ();
   if (! s->output_data.x) abort ();
-  if (! s->output_data.x->normal_gc) abort ();
 
   BLOCK_INPUT;
   x_free_gcs (s);
@@ -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
@@ -1016,3 +1021,6 @@ widget_store_internal_border (widget)
 
   ew->emacs_frame.internal_border_width = f->internal_border_width;
 }
+
+/* arch-tag: 931d28e5-0d59-405a-8325-7d475d0a13d9
+   (do not change this comment) */