* xterm.c (x_error_handler): Also ignore BadWindow for X_SetInputFocus,

don't check minor_code.

Fixes: debbugs:14417

diff --git a/src/ChangeLog b/src/ChangeLog
index 642b6b322318fc292c532f2709cc7906361d0fc5..f1293be9855b203ef8dc90e57b5fe8fe29c829a4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-10  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xterm.c (x_error_handler): Also ignore BadWindow for X_SetInputFocus,
+       don't check minor_code (Bug#14417).
+
 2013-08-09  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (draw_glyphs): Don't compare row pointers, compare row

diff --git a/src/xterm.c b/src/xterm.c
index db5ca1a1fbb221c0aef27d3af9daa9b2c9124fbf..55347a3310e222f8a1278022190a18195b85d9c8 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7808,9 +7808,8 @@ static int
 x_error_handler (Display *display, XErrorEvent *event)
 {
 #if defined USE_GTK && defined HAVE_GTK3
-  if (event->error_code == BadMatch
-      && event->request_code == X_SetInputFocus
-      && event->minor_code == 0)
+  if ((event->error_code == BadMatch || event->error_code == BadWindow)
+      && event->request_code == X_SetInputFocus)
     {
       return 0;
     }