(eshell/time): Stringify and flatten the non-command arguments.

[gnu-emacs] / src / widget.c

diff --git a/src/widget.c b/src/widget.c
index 2e9913308d0e327794fffea2fbc0668e7a835124..c76cce9e328d73570847c27d3b078a54d440a653 100644 (file)
--- a/src/widget.c
+++ b/src/widget.c
@@ -1,12 +1,12 @@
 /* The emacs frame widget.
 /* The emacs frame widget.

-   Copyright (C) 1992, 1993, 2000, 2002, 2003, 2004,
-                 2005, 2006 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
 
 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,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -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'.  */
         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);
       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
 
       /* 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.  */
         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),
       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);
                      XtNheight, (XtArgVal) pixel_height,
                     XtNwidth, (XtArgVal) pixel_width,
                     NULL);

+      x_uncatch_errors ();
+

 #ifdef SIGIO
       sigunblock (sigmask (SIGIO));
 #endif
 #ifdef SIGIO
       sigunblock (sigmask (SIGIO));
 #endif