[Emacs-diffs] trunk r114402: * xterm.c (handle_one_xevent): Revert part of 2013-09-17 change

[Dmitry Antipov]

------------------------------------------------------------
revno: 114402
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-09-20 07:30:50 +0400
message:
  * xterm.c (handle_one_xevent): Revert part of 2013-09-17 change
  to avoid Bug#15398.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-19 08:25:43 +0000
+++ b/src/ChangeLog     2013-09-20 03:30:50 +0000
@@ -1,3 +1,8 @@
+2013-09-20  Dmitry Antipov  <address@hidden>
+
+       * xterm.c (handle_one_xevent): Revert part of 2013-09-17 change
+       to avoid Bug#15398.
+
 2013-09-19  Eli Zaretskii  <address@hidden>
 
        * w32reg.c (w32_get_string_resource): Make the first 2 arguments

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-09-19 07:48:53 +0000
+++ b/src/xterm.c       2013-09-20 03:30:50 +0000
@@ -6101,13 +6101,6 @@
       f = x_window_to_frame (dpyinfo, event->xexpose.window);
       if (f)
         {
-#if ! GTK_CHECK_VERSION (2, 7, 0)
-          /* This seems to be needed for GTK 2.6.  */
-         x_clear_area (event->xexpose.display,
-                       event->xexpose.window,
-                       event->xexpose.x, event->xexpose.y,
-                       event->xexpose.width, event->xexpose.height);
-#endif
           if (!FRAME_VISIBLE_P (f))
             {
               SET_FRAME_VISIBLE (f, 1);
@@ -6116,8 +6109,18 @@
               SET_FRAME_GARBAGED (f);
             }
           else
-           expose_frame (f, event->xexpose.x, event->xexpose.y,
-                         event->xexpose.width, event->xexpose.height);
+           {
+#ifdef USE_GTK
+             /* This seems to be needed for GTK 2.6 and later, see
+                http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15398.  */
+             x_clear_area (event->xexpose.display,
+                           event->xexpose.window,
+                           event->xexpose.x, event->xexpose.y,
+                           event->xexpose.width, event->xexpose.height);
+#endif
+             expose_frame (f, event->xexpose.x, event->xexpose.y,
+                           event->xexpose.width, event->xexpose.height);
+           }
         }
       else
         {