* xterm.c (x_uncatch_errors): Block input for entire function.

2 files changed, 8 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e1b3b52e7d6..f6edc410276 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xterm.c (x_uncatch_errors): Block input for entire function.
+
 2006-03-12  Jason Rumney  <jasonr@gnu.org>
 
         * w32fns.c (Fx_create_frame): Remove call to
diff --git a/src/xterm.c b/src/xterm.c
index 92b245f2b32..30a41574e82 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7533,18 +7533,17 @@ x_uncatch_errors ()
 {
   struct x_error_message_stack *tmp;
 
+  BLOCK_INPUT;
+
   /* The display may have been closed before this function is called.
      Check if it is still open before calling XSync.  */
   if (x_display_info_for_display (x_error_message->dpy) != 0)
-    {
-      BLOCK_INPUT;
-      XSync (x_error_message->dpy, False);
-      UNBLOCK_INPUT;
-    }
+    XSync (x_error_message->dpy, False);
 
   tmp = x_error_message;
   x_error_message = x_error_message->prev;
   xfree (tmp);
+  UNBLOCK_INPUT;
 }
 
 /* If any X protocol errors have arrived since the last call to