[Emacs-diffs] trunk r117177: * xterm.c (x_free_frame_resources): Fix last change.

[Dmitry Antipov]

------------------------------------------------------------
revno: 117177
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2014-05-28 15:41:48 +0400
message:
  * xterm.c (x_free_frame_resources): Fix last change.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-28 08:00:10 +0000
+++ b/src/ChangeLog     2014-05-28 11:41:48 +0000
@@ -8,7 +8,8 @@
        * cmds.c (Fself_insert_command): Use SELECTED_FRAME.
        * keyboard.c (gobble_input): If there is no terminal input error,
        make sure the pointer is visible for all frames on this terminal.
-       * xterm.c (x_free_frame_resources): Always enable pointer visibility.
+       * xterm.c (x_free_frame_resources): Enable pointer visibility if
+       it was previously disabled.
 
 2014-05-28  Stefan Monnier  <address@hidden>
 

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2014-05-28 08:00:10 +0000
+++ b/src/xterm.c       2014-05-28 11:41:48 +0000
@@ -9235,7 +9235,8 @@
     {
       /* Always exit with visible pointer to avoid weird issue
         with Xfixes (Bug#17609).  */
-      FRAME_DISPLAY_INFO (f)->toggle_visible_pointer (f, 0);
+      if (f->pointer_invisible)
+       FRAME_DISPLAY_INFO (f)->toggle_visible_pointer (f, 0);
 
       /* We must free faces before destroying windows because some
         font-driver (e.g. xft) access a window while finishing a