diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-08-10 11:16:37 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-08-10 11:16:37 +0200 |
| commit | 361c0eb8ecfda5e7720e927e580ef6033f023e08 (patch) | |
| tree | 314c3db21afa16be81881de58b06af8177ae33e7 /src/xterm.c | |
| parent | d4166523bc8c4565cde24fcda56d3d5cdabb70ce (diff) | |
| download | emacs-361c0eb8ecfda5e7720e927e580ef6033f023e08.tar.gz | |
* xterm.c (x_error_handler): Also ignore BadWindow for X_SetInputFocus,
don't check minor_code.
Fixes: debbugs:14417
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 5 |
1 files changed, 2 insertions, 3 deletions
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; } |