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

1 files changed, 16 insertions, 0 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.