Merged from miles@gnu.org--gnu-2005 (patch 69, 313-319)

Patches applied:

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-314
   Merge from gnus--rel--5.10

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-69
   Update from CVS

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

5 files changed, 70 insertions, 52 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 09c70c9ead8..760822236fe 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -112,21 +112,45 @@ define pitx
   if ($it->start.pos.charpos != $it->start.pos.bytepos)
     printf "[%d]", $it->start.pos.bytepos
   end
-  printf " stop=%d ", $it->stop_charpos
-  output $it->what
+  printf " end=%d", $it->end_charpos
+  printf " stop=%d", $it->stop_charpos
+  printf " face=%d", $it->face_id
+  if ($it->multibyte_p)
+    printf " MB"
+  end
+  if ($it->header_line_p)
+    printf " HL"
+  end
+  if ($it->n_overlay_strings > 0)
+    printf " nov=%d"
+  end
+  if ($it->sp != 0)
+    printf " sp=%d", $it->sp
+  end
   if ($it->what == IT_CHARACTER)
     if ($it->len == 1 && $it->c >= ' ' && it->c < 255)
-      printf "['%c']", $it->c
+      printf "ch='%c'", $it->c
     else
-      printf "[%d,%d]", $it->c, $it->len
+      printf "ch=[%d,%d]", $it->c, $it->len
+    end
+  else
+    if ($it->what == IT_IMAGE)
+      printf "IMAGE=%d", $it->image_id
+    else
+      output $it->what
     end
   end
-  printf " next="
-  output $it->method
+  if ($it->method != GET_FROM_BUFFER)
+    printf " next="
+    output $it->method
+  end
   printf "\n"
+  if ($it->region_beg_charpos >= 0)
+    printf "reg=%d-%d ", $it->region_beg_charpos, $it->region_end_charpos
+  end
   printf "vpos=%d hpos=%d", $it->vpos, $it->hpos,
   printf " y=%d lvy=%d", $it->current_y, $it->last_visible_y
-  printf " x=%d lvx=%d", $it->current_x, $it->last_visible_x
+  printf " x=%d vx=%d-%d", $it->current_x, $it->first_visible_x, $it->last_visible_x
   printf " a+d=%d+%d=%d", $it->ascent, $it->descent, $it->ascent+$it->descent
   printf " max=%d+%d=%d", $it->max_ascent, $it->max_descent, $it->max_ascent+$it->max_descent
   printf "\n"
diff --git a/src/ChangeLog b/src/ChangeLog
index fd11243cbb0..951bf142541 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2005-05-19  Nick Roberts  <nickrob@snap.net.nz>
+
+        * keyboard.c (syms_of_keyboard): Remove lisp variables
+        post-command-idle-hook and post-command-idle-delay.
+        (command_loop_1): Don't try to execute post-command-idle-hook.
+
+2005-05-16  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (handle_display_prop): Handle empty replacement.
+        (handle_single_display_spec): Return -1 for empty replacement.
+
+        * keyboard.c (adjust_point_for_property): Skip empty overlay string.
+
+        * .gdbinit (pitx): Print more info about iterator.
+
+2005-05-16  Andreas Schwab  <schwab@suse.de>
+
+        * unexmacosx.c (unexec_realloc): Move declarations before
+        statements.
+
 2005-05-14  Richard M. Stallman  <rms@gnu.org>
 
         * xdisp.c (message3): Call cancel_echoing.
@@ -18,7 +38,7 @@
         (Finsert_file_contents): If we read 0 bytes from a special file,
         unlock the visited file if we locked it.
         (Fmake_symbolic_link, Frecent_auto_save_p): Doc fixes.
-        (Ffile_exists_p, Ffile_symlink_p): Doc fixes. 
+        (Ffile_exists_p, Ffile_symlink_p): Doc fixes.
 
 2005-05-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 596df7aed79..490593750d3 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -446,11 +446,6 @@ Lisp_Object Qecho_area_clear_hook;
 Lisp_Object Qpre_command_hook, Vpre_command_hook;
 Lisp_Object Qpost_command_hook, Vpost_command_hook;
 Lisp_Object Qcommand_hook_internal, Vcommand_hook_internal;
-/* Hook run after a command if there's no more input soon.  */
-Lisp_Object Qpost_command_idle_hook, Vpost_command_idle_hook;
-
-/* Delay time in microseconds before running post-command-idle-hook.  */
-EMACS_INT post_command_idle_delay;
 
 /* List of deferred actions to be performed at a later time.
    The precise format isn't relevant here; we just check whether it is nil.  */
@@ -1432,16 +1427,6 @@ command_loop_1 ()
 
       if (!NILP (Vdeferred_action_list))
         safe_run_hooks (Qdeferred_action_function);
-
-      if (!NILP (Vpost_command_idle_hook) && !NILP (Vrun_hooks))
-        {
-          if (NILP (Vunread_command_events)
-              && NILP (Vunread_input_method_events)
-              && NILP (Vunread_post_input_method_events)
-              && NILP (Vexecuting_kbd_macro)
-              && !NILP (sit_for (0, post_command_idle_delay, 0, 1, 1)))
-            safe_run_hooks (Qpost_command_idle_hook);
-        }
     }
 
   Vmemory_full = Qnil;
@@ -1807,16 +1792,6 @@ command_loop_1 ()
       if (!NILP (Vdeferred_action_list))
         safe_run_hooks (Qdeferred_action_function);
 
-      if (!NILP (Vpost_command_idle_hook) && !NILP (Vrun_hooks))
-        {
-          if (NILP (Vunread_command_events)
-              && NILP (Vunread_input_method_events)
-              && NILP (Vunread_post_input_method_events)
-              && NILP (Vexecuting_kbd_macro)
-              && !NILP (sit_for (0, post_command_idle_delay, 0, 1, 1)))
-            safe_run_hooks (Qpost_command_idle_hook);
-        }
-
       /* If there is a prefix argument,
          1) We don't want Vlast_command to be ``universal-argument''
          (that would be dumb), so don't set Vlast_command,
@@ -1932,10 +1907,13 @@ adjust_point_for_property (last_pt, modified)
               ? get_property_and_range (PT, Qdisplay, &val, &beg, &end, Qnil)
               : (beg = OVERLAY_POSITION (OVERLAY_START (overlay)),
                  end = OVERLAY_POSITION (OVERLAY_END (overlay))))
-          && beg < PT) /* && end > PT   <- It's always the case.  */
+          && (beg < PT /* && end > PT   <- It's always the case.  */
+              || (beg <= PT && STRINGP (val) && SCHARS (val) == 0)))
         {
           xassert (end > PT);
-          SET_PT (PT < last_pt ? beg : end);
+          SET_PT (PT < last_pt
+                  ? (STRINGP (val) && SCHARS (val) == 0 ? beg - 1 : beg)
+                  : end);
           check_composition = check_invisible = 1;
         }
       check_display = 0;
@@ -10987,9 +10965,6 @@ syms_of_keyboard ()
   Qpost_command_hook = intern ("post-command-hook");
   staticpro (&Qpost_command_hook);
 
-  Qpost_command_idle_hook = intern ("post-command-idle-hook");
-  staticpro (&Qpost_command_idle_hook);
-
   Qdeferred_action_function = intern ("deferred-action-function");
   staticpro (&Qdeferred_action_function);
 
@@ -11435,16 +11410,6 @@ the hook value is set to nil, since otherwise the error
 might happen repeatedly and make Emacs nonfunctional.  */);
   Vpost_command_hook = Qnil;
 
-  DEFVAR_LISP ("post-command-idle-hook", &Vpost_command_idle_hook,
-               doc: /* Normal hook run after each command is executed, if idle.
-Errors running the hook are caught and ignored.  */);
-  Vpost_command_idle_hook = Qnil;
-
-  DEFVAR_INT ("post-command-idle-delay", &post_command_idle_delay,
-              doc: /* Delay time before running `post-command-idle-hook'.
-This is measured in microseconds.  */);
-  post_command_idle_delay = 100000;
-
 #if 0
   DEFVAR_LISP ("echo-area-clear-hook", ...,
                doc: /* Normal hook run when clearing the echo area.  */);
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index fc369eab7cd..e54dbea448c 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -1,5 +1,5 @@
 /* Dump Emacs in Mach-O format for use on Mac OS X.
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1069,10 +1069,10 @@ unexec_realloc (void *old_ptr, size_t new_size)
 
       if (ptr_in_unexec_regions (old_ptr))
         {
-          p = (size_t *) malloc (new_size);
           size_t old_size = ((unexec_malloc_header_t *) old_ptr)[-1].u.size;
           size_t size = new_size > old_size ? old_size : new_size;
 
+          p = (size_t *) malloc (new_size);
           if (size)
             memcpy (p, old_ptr, size);
         }
diff --git a/src/xdisp.c b/src/xdisp.c
index 7d4ac6916fa..6bde1970bf3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3458,7 +3458,10 @@ handle_display_prop (it)
     }
   else
     {
-      if (handle_single_display_spec (it, prop, object, position, 0))
+      int ret = handle_single_display_spec (it, prop, object, position, 0);
+      if (ret < 0)  /* Replaced by "", i.e. nothing. */
+        return HANDLED_RECOMPUTE_PROPS;
+      if (ret)
         display_replaced_p = 1;
     }
 
@@ -3502,7 +3505,8 @@ display_prop_end (it, object, start_pos)
    property ends.
 
    Value is non-zero if something was found which replaces the display
-   of buffer or string text.  */
+   of buffer or string text.  Specifically, the value is -1 if that
+   "something" is "nothing". */
 
 static int
 handle_single_display_spec (it, spec, object, position,
@@ -3816,6 +3820,11 @@ handle_single_display_spec (it, spec, object, position,
 
       if (STRINGP (value))
         {
+          if (SCHARS (value) == 0)
+            {
+              pop_it (it);
+              return -1;  /* Replaced by "", i.e. nothing.  */
+            }
           it->string = value;
           it->multibyte_p = STRING_MULTIBYTE (it->string);
           it->current.overlay_string_index = -1;