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 @@
+2014-06-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * xterm.c (x_setup_pointer_blanking): Conditionally
+        probe Xfixes until this stuff is stabilized (Bug#17609).
+
 2014-06-05  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * 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)
 static void
 x_setup_pointer_blanking (struct x_display_info *dpyinfo)
 {
-  if (x_probe_xfixes_extension (dpyinfo->display))
+  /* FIXME: the brave tester should set EMACS_XFIXES because we're suspecting
+     X server bug, see http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17609.  */
+  if (egetenv ("EMACS_XFIXES") && x_probe_xfixes_extension (dpyinfo->display))
     dpyinfo->toggle_visible_pointer = xfixes_toggle_visible_pointer;
   else
     {