[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113786: * xterm.c (x_error_handler): Also ignore Ba
From: |
Jan D. |
Subject: |
[Emacs-diffs] trunk r113786: * xterm.c (x_error_handler): Also ignore BadWindow for X_SetInputFocus, |
Date: |
Sat, 10 Aug 2013 09:17:06 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113786
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14417
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2013-08-10 11:16:37 +0200
message:
* xterm.c (x_error_handler): Also ignore BadWindow for X_SetInputFocus,
don't check minor_code.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xterm.c xterm.c-20091113204419-o5vbwnq5f7feedwu-244
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-08-09 21:19:42 +0000
+++ b/src/ChangeLog 2013-08-10 09:16:37 +0000
@@ -1,3 +1,8 @@
+2013-08-10 Jan Djärv <address@hidden>
+
+ * xterm.c (x_error_handler): Also ignore BadWindow for X_SetInputFocus,
+ don't check minor_code (Bug#14417).
+
2013-08-09 Eli Zaretskii <address@hidden>
* xdisp.c (draw_glyphs): Don't compare row pointers, compare row
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2013-08-09 12:25:34 +0000
+++ b/src/xterm.c 2013-08-10 09:16:37 +0000
@@ -7808,9 +7808,8 @@
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;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113786: * xterm.c (x_error_handler): Also ignore BadWindow for X_SetInputFocus,,
Jan D. <=