Merged from miles@gnu.org--gnu-2005 (patch 160-161)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-160
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-161
   Update from CVS

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

3 files changed, 56 insertions, 21 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fc2ded6ce94..854a8673458 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2005-03-07  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (CLEAR_IMAGE_CACHE_COUNT): New const.
+        (clear_image_cache_count): New var.
+        (redisplay_internal): Don't clear face and image caches in the
+        middle of redisplay; do it afterwards.
+
+        * blockinput.h (TOTALLY_UNBLOCK_INPUT): Avoid dangling else.
+
+        * xdisp.c (notice_overwritten_cursor): Check that phys_cursor.vpos
+        is valid.  If not, clear phys_cursor_on_p and return.
+
+2005-03-07  Andreas Schwab  <schwab@suse.de>
+
+        * blockinput.h (UNBLOCK_INPUT_TO): Always call UNBLOCK_INPUT.
+
 2005-03-06  Richard M. Stallman  <rms@gnu.org>
 
         * keyboard.c (Ftop_level): Let Fthrow deal with UNBLOCK_INPUT.
diff --git a/src/blockinput.h b/src/blockinput.h
index a3b50d2a0f2..6aa865ea9be 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -98,12 +98,12 @@ extern int pending_atimers;
    and also reinvoke any pending signal.  */
 
 #define TOTALLY_UNBLOCK_INPUT                   \
-  if (interrupt_input_blocked != 0)             \
+  do if (interrupt_input_blocked != 0)          \
     {                                           \
       interrupt_input_blocked = 1;              \
       UNBLOCK_INPUT;                            \
     }                                           \
-  else
+  while (0)
 
 /* Undo any number of BLOCK_INPUT calls down to level LEVEL,
    and also (if the level is now 0) reinvoke any pending signal.  */
@@ -111,10 +111,8 @@ extern int pending_atimers;
 #define UNBLOCK_INPUT_TO(LEVEL)                         \
   do                                                    \
     {                                                   \
-      int oldlevel = interrupt_input_blocked;           \
       interrupt_input_blocked = (LEVEL) + 1;            \
-      if (interrupt_input_blocked != oldlevel + 1)      \
-        UNBLOCK_INPUT;                                  \
+      UNBLOCK_INPUT;                                    \
     }                                                   \
   while (0)
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 2b69e885954..7f7e60e81b8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -781,6 +781,13 @@ enum move_it_result
 #define CLEAR_FACE_CACHE_COUNT  500
 static int clear_face_cache_count;
 
+/* Similarly for the image cache.  */
+
+#ifdef HAVE_WINDOW_SYSTEM
+#define CLEAR_IMAGE_CACHE_COUNT 101
+static int clear_image_cache_count;
+#endif
+
 /* Non-zero while redisplay_internal is in progress.  */
 
 int redisplaying_p;
@@ -10360,7 +10367,9 @@ redisplay_internal (preserve_echo_area)
   CHARPOS (this_line_start_pos) = 0;
   consider_all_windows_p |= buffer_shared > 1;
   ++clear_face_cache_count;
-
+#ifdef HAVE_WINDOW_SYSTEM
+  ++clear_image_cache_count;
+#endif
 
   /* Build desired matrices, and update the display.  If
      consider_all_windows_p is non-zero, do it for all windows on all
@@ -10373,13 +10382,6 @@ redisplay_internal (preserve_echo_area)
       struct frame **updated
         = (struct frame **) alloca (size * sizeof *updated);
 
-      /* Clear the face cache eventually.  */
-      if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT)
-        {
-          clear_face_cache (0);
-          clear_face_cache_count = 0;
-        }
-
       /* Recompute # windows showing selected buffer.  This will be
          incremented each time such a window is displayed.  */
       buffer_shared = 0;
@@ -10395,12 +10397,6 @@ redisplay_internal (preserve_echo_area)
                    variables.  */
                 select_frame_for_redisplay (frame);
 
-#ifdef HAVE_WINDOW_SYSTEM
-              if (clear_face_cache_count % 50 == 0
-                  && FRAME_WINDOW_P (f))
-                clear_image_cache (f, 0);
-#endif /* HAVE_WINDOW_SYSTEM */
-
               /* Mark all the scroll bars to be removed; we'll redeem
                  the ones we want when we redisplay their windows.  */
               if (FRAME_DISPLAY (f)->condemn_scroll_bars_hook)
@@ -10604,6 +10600,29 @@ redisplay_internal (preserve_echo_area)
   if (windows_or_buffers_changed && !pause)
     goto retry;
 
+  /* Clear the face cache eventually.  */
+  if (consider_all_windows_p)
+    {
+      if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT)
+        {
+          clear_face_cache (0);
+          clear_face_cache_count = 0;
+        }
+#ifdef HAVE_WINDOW_SYSTEM
+      if (clear_image_cache_count > CLEAR_IMAGE_CACHE_COUNT)
+        {
+          Lisp_Object tail, frame;
+          FOR_EACH_FRAME (tail, frame)
+            {
+              struct frame *f = XFRAME (frame);
+              if (FRAME_WINDOW_P (f))
+                clear_image_cache (f, 0);
+            }
+          clear_image_cache_count = 0;
+        }
+#endif /* HAVE_WINDOW_SYSTEM */
+    }
+
  end_of_redisplay:
   unbind_to (count, Qnil);
   RESUME_POLLING;
@@ -20202,8 +20221,10 @@ notice_overwritten_cursor (w, area, x0, x1, y0, y1)
   if (area != TEXT_AREA)
     return;
 
-  row = w->current_matrix->rows + w->phys_cursor.vpos;
-  if (!row->displays_text_p)
+  if (w->phys_cursor.vpos < 0
+      || w->phys_cursor.vpos >= w->current_matrix->nrows
+      || (row = w->current_matrix->rows + w->phys_cursor.vpos,
+          !(row->enabled_p && row->displays_text_p)))
     return;
 
   if (row->cursor_in_fringe_p)