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

4 files changed, 49 insertions, 6 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
diff --git a/src/alloc.c b/src/alloc.c
index ae156d89f24..1d50f19e921 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2866,6 +2866,10 @@ int marker_block_index;
 
 union Lisp_Misc *marker_free_list;
 
+/* Marker blocks which should be freed at end of GC.  */
+
+struct marker_block *marker_blocks_pending_free;
+
 /* Total number of marker blocks now in use.  */
 
 int n_marker_blocks;
@@ -2876,6 +2880,7 @@ init_marker ()
   marker_block = NULL;
   marker_block_index = MARKER_BLOCK_SIZE;
   marker_free_list = 0;
+  marker_blocks_pending_free = 0;
   n_marker_blocks = 0;
 }
 
@@ -4531,6 +4536,18 @@ returns nil, because real GC can't be done.  */)
       }
   }
 
+  /* Undo lists have been cleaned up, so we can free marker blocks now.  */
+
+  {
+    struct marker_block *mblk;
+
+    while ((mblk = marker_blocks_pending_free) != 0)
+      {
+        marker_blocks_pending_free = mblk->next;
+        lisp_free (mblk);
+      }
+  }
+
   /* Clear the mark bits that we set in certain root slots.  */
 
   unmark_byte_stack ();
@@ -5439,6 +5456,7 @@ gc_sweep ()
     register int num_free = 0, num_used = 0;
 
     marker_free_list = 0;
+    marker_blocks_pending_free = 0;
 
     for (mblk = marker_block; mblk; mblk = *mprev)
       {
@@ -5469,19 +5487,20 @@ gc_sweep ()
         /* If this block contains only free markers and we have already
            seen more than two blocks worth of free markers then deallocate
            this block.  */
-#if 0
-        /* There may still be pointers to these markers from a buffer's
-           undo list, so don't free them.  KFS 2004-05-21  /
         if (this_free == MARKER_BLOCK_SIZE && num_free > MARKER_BLOCK_SIZE)
           {
             *mprev = mblk->next;
             /* Unhook from the free list.  */
             marker_free_list = mblk->markers[0].u_free.chain;
-            lisp_free (mblk);
             n_marker_blocks--;
+
+            /* It is not safe to free the marker block at this stage,
+               since there may still be pointers to these markers from
+               a buffer's undo list.  KFS 2004-05-25.  */
+            mblk->next = marker_blocks_pending_free;
+            marker_blocks_pending_free = mblk;
           }
         else
-#endif
           {
             num_free += this_free;
             mprev = &mblk->next;
diff --git a/src/process.c b/src/process.c
index d5e76b29b98..9d76b5bd1f9 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4581,7 +4581,8 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
                 }
             }
 #ifdef NON_BLOCKING_CONNECT
-          if (check_connect && FD_ISSET (channel, &Connecting))
+          if (check_connect && FD_ISSET (channel, &Connecting)
+              && FD_ISSET (channel, &connect_wait_mask))
             {
               struct Lisp_Process *p;
 
diff --git a/src/xdisp.c b/src/xdisp.c
index cd62ce97f18..48f73c5c738 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4559,6 +4559,14 @@ back_to_previous_visible_line_start (it)
             visible_p = 0;
         }
 
+      if (visible_p)
+        {
+          struct it it2 = *it;
+
+          if (handle_display_prop (&it2) == HANDLED_RETURN)
+            visible_p = 0;
+        }
+
       /* Back one more newline if the current one is invisible.  */
       if (!visible_p)
         back_to_previous_line_start (it);