Merge from mainline.

2 files changed, 13 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7e9bec9b6e9..007a21e0353 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-03-22  Paul Eggert  <eggert@cs.ucla.edu>
+2011-03-23  Paul Eggert  <eggert@cs.ucla.edu>
 
         * coding.c (encode_coding_raw_text): Avoid unnecessary test
         the first time through the loop, since we know p0 < p1 then.
@@ -22,8 +22,6 @@
         * scroll.c (do_scrolling): Work around GCC bug 48228.
         See <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48228>.
 
-2011-03-21  Paul Eggert  <eggert@cs.ucla.edu>
-
         * frame.c (Fmodify_frame_parameters): Simplify loop counter.
         This also avoids a warning with gcc -Wstrict-overflow.
         (validate_x_resource_name): Simplify count usage.
@@ -125,6 +123,11 @@
         * callproc.c (call_process_cleanup): Now static.
         (relocate_fd): Rename locals to avoid shadowing.
 
+2011-03-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xterm.c (x_clear_frame): Remove XClearWindow call.  This appears
+        not to be necessary, and produces flickering.
+
 2011-03-20  Glenn Morris  <rgm@gnu.org>
 
         * config.in: Remove file.
diff --git a/src/xterm.c b/src/xterm.c
index fd7ffd68e62..f87c22912a4 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2928,10 +2928,14 @@ x_clear_frame (struct frame *f)
   /* We don't set the output cursor here because there will always
      follow an explicit cursor_to.  */
   BLOCK_INPUT;
-  XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
 
-  /* We have to clear the scroll bars, too.  If we have changed
-     colors or something like that, then they should be notified.  */
+  /* The following calls have been commented out because they do not
+     seem to accomplish anything, apart from causing flickering during
+     window resize.  */
+  /* XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); */
+
+  /* We have to clear the scroll bars.  If we have changed colors or
+     something like that, then they should be notified.  */
   x_scroll_bar_clear (f);
 
 #if defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)