* xterm.c (handle_one_xevent): Revert part of 2013-09-17 change

to avoid Bug#15398.

* xterm.c (handle_one_xevent): Revert part of 2013-09-17 change
to avoid Bug#15398.
2b943ba6 · Dmitry Antipov · 230fe2a5 · 2b943ba6 · 2b943ba6
Commit 2b943ba6 authored Sep 20, 2013 by Dmitry Antipov
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 9 deletions

src/ChangeLog src/ChangeLog +5 -0

src/xterm.c src/xterm.c +12 -9

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2013-09-20  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* xterm.c (handle_one_xevent): Revert part of 2013-09-17 change
+	to avoid Bug#15398.
+
 2013-09-19  Eli Zaretskii  <eliz@gnu.org>

 	* w32reg.c (w32_get_string_resource): Make the first 2 arguments

--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6101,13 +6101,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
      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 @@ handle_one_xevent (struct x_display_info *dpyinfo,
              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
        {