aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov2014-06-06 05:11:26 +0400
committerDmitry Antipov2014-06-06 05:11:26 +0400
commitb77205c029520f123ed1d41cba12262d4fcca09e (patch)
tree0b4925dd72c5b727f2add66f034d1690eb45b431 /src
parent4a8160204325c4b955647fe9e0a944c1f8c705dd (diff)
downloademacs-b77205c029520f123ed1d41cba12262d4fcca09e.tar.gz
emacs-b77205c029520f123ed1d41cba12262d4fcca09e.zip
* xterm.c (x_setup_pointer_blanking): Conditionally
probe Xfixes until this stuff is stabilized (Bug#17609).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2a149a07214..38feb804cd4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-06-06 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * xterm.c (x_setup_pointer_blanking): Conditionally
4 probe Xfixes until this stuff is stabilized (Bug#17609).
5
12014-06-05 Dmitry Antipov <dmantipov@yandex.ru> 62014-06-05 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 * keyboard.c, process.c: Do not define POLL_FOR_INPUT here 8 * keyboard.c, process.c: Do not define POLL_FOR_INPUT here
diff --git a/src/xterm.c b/src/xterm.c
index 6f1807d4176..8c2b6254e59 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9781,7 +9781,9 @@ x_toggle_visible_pointer (struct frame *f, bool invisible)
9781static void 9781static void
9782x_setup_pointer_blanking (struct x_display_info *dpyinfo) 9782x_setup_pointer_blanking (struct x_display_info *dpyinfo)
9783{ 9783{
9784 if (x_probe_xfixes_extension (dpyinfo->display)) 9784 /* FIXME: the brave tester should set EMACS_XFIXES because we're suspecting
9785 X server bug, see http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17609. */
9786 if (egetenv ("EMACS_XFIXES") && x_probe_xfixes_extension (dpyinfo->display))
9785 dpyinfo->toggle_visible_pointer = xfixes_toggle_visible_pointer; 9787 dpyinfo->toggle_visible_pointer = xfixes_toggle_visible_pointer;
9786 else 9788 else
9787 { 9789 {