Revert "Attempt to fix slow redisplay caused by last changes"

* src/xdisp.c (try_window_id, try_window_reusing_current_matrix)
(try_cursor_movement): Don't relax requirements for redisplay
optimizations for the selected frame.  (Bug#21597)

This reverts commit c4c1fb97727ff52bcfa83ad5ed94a64a93d12e59.

diff --git a/src/xdisp.c b/src/xdisp.c
index ce27af2e67bf071b0dcc612e584534bde3a8a9de..1524783bf2fcdaba422d783d30b7a53c29ded328 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -15442,7 +15442,7 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp,
       && !update_mode_lines
       && !windows_or_buffers_changed
       && !f->cursor_type_changed
-      && !(f != SELECTED_FRAME () && f->redisplay)
+      && !f->redisplay
       && NILP (Vshow_trailing_whitespace)
       /* This code is not used for mini-buffer for the sake of the case
         of redisplaying to replace an echo area message; since in
@@ -17053,7 +17053,7 @@ try_window_reusing_current_matrix (struct window *w)
       /* Don't try to reuse the display if windows have been split
         or such.  */
       || windows_or_buffers_changed
-      || (f != SELECTED_FRAME () && f->redisplay)
+      || f->redisplay
       || f->cursor_type_changed)
     return false;
 
@@ -17831,8 +17831,7 @@ try_window_id (struct window *w)
     GIVE_UP (1);
 
   /* This flag is used to prevent redisplay optimizations.  */
-  if (windows_or_buffers_changed || f->cursor_type_changed
-      || (f != SELECTED_FRAME () && f->redisplay))
+  if (windows_or_buffers_changed || f->cursor_type_changed || f->redisplay)
     GIVE_UP (2);
 
   /* This function's optimizations cannot be used if overlays have