Remove remaining references to updating_frame.

* src/dispextern.h (updated_window): Remove comment reference to
  updating_frame.

* src/dispnew.c (update_window): Remove bogus xassert.

* src/xterm.c: (x_clear_frame): Update comment.
  (x_draw_window_cursor): Remove reference to updating_frame.


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-270

3 files changed, 3 insertions, 7 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index d2ca9564ef8..99cf38249ac 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1013,8 +1013,7 @@ extern int fonts_changed_p;
 extern struct glyph space_glyph;
 
 /* Window being updated by update_window.  This is non-null as long as
-   update_window has not finished, and null otherwise.  It's role is
-   analogous to updating_frame.  */
+   update_window has not finished, and null otherwise.  */
 
 extern struct window *updated_window;
 
diff --git a/src/dispnew.c b/src/dispnew.c
index a148f27a1ef..f2fac47a7c2 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4071,7 +4071,6 @@ update_window (w, force_p)
 
   /* Check that W's frame doesn't have glyph matrices.  */
   xassert (FRAME_WINDOW_P (f));
-  xassert (updating_frame != NULL);
 
   /* Check pending input the first time so that we can quickly return.  */
   if (redisplay_dont_pause)
diff --git a/src/xterm.c b/src/xterm.c
index 5c7775d6777..480ee1c624a 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2796,8 +2796,7 @@ x_clear_area (dpy, window, x, y, width, height, exposures)
 }
 
 
-/* Clear entire frame.  If updating_frame is non-null, clear that
-   frame.  Otherwise clear the selected frame.  */
+/* Clear an entire frame.  */
 
 static void
 x_clear_frame (struct frame *f)
@@ -7390,8 +7389,7 @@ x_draw_window_cursor (w, glyph_row, x, y, cursor_type, cursor_width, on_p, activ
     }
 
 #ifndef XFlush
-  if (updating_frame != f)
-    XFlush (FRAME_X_DISPLAY (f));
+  XFlush (FRAME_X_DISPLAY (f));
 #endif
 }