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

don't check minor_code.

Fixes: debbugs:14417

2 files changed, 7 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 642b6b32231..f1293be9855 100644
--- 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 db5ca1a1fbb..55347a3310e 100644
--- 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;
     }