Merged in changes from CVS trunk.

Patches applied:

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

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


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

1 files changed, 15 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cbbf4ab09a7..f15b1e582d9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2004-05-27  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (back_to_previous_visible_line_start): Skip backwards
+        over display properties, e.g. images, that replace buffer text.
+
+2004-05-25  Kim F. Storm  <storm@cua.dk>
+
+        * alloc.c (marker_blocks_pending_free): New var.
+        (gc_sweep): Store free marker blocks on that list.
+        (Fgarbage_collect): Free them after undo-list cleanup.
+
+        * process.c (wait_reading_process_input): Check connect_wait_mask
+        before actually accepting connection in case it has already been
+        accepted due to recursion.
+
 2004-05-23  K,Ba(Broly L,Bu(Brentey  <lorentey@elte.hu>  (tiny change)
 
         * coding.c (Fset_safe_terminal_coding_system_internal): Set