Merged in changes from CVS HEAD

Patches applied:

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-196
   Remove RCS keywords

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-197
   Stupid CVS keyword changes

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

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


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

3 files changed, 44 insertions, 33 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a1c04c1151..1b5144e5b56 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-11  Masatake YAMATO  <jet@gyve.org>
+
+        * buffer.c (fix_start_end_in_overlays): make overlays 
+        empty if they are backwards.
+
 2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * doc.c (Fsnarf_documentation): Ignore new file name entries.
diff --git a/src/buffer.c b/src/buffer.c
index 08031a0d72b..455b03efec2 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3290,8 +3290,7 @@ adjust_overlays_for_delete (pos, length)
    endpoint in this range will need to be unlinked from the overlay
    list and reinserted in its proper place.
    Such an overlay might even have negative size at this point.
-   If so, we'll reverse the endpoints.  Can you think of anything
-   better to do in this situation?  */
+   If so, we'll make the overlay empty. */
 void
 fix_start_end_in_overlays (start, end)
      register int start, end;
@@ -3318,23 +3317,24 @@ fix_start_end_in_overlays (start, end)
   for (parent = NULL, tail = current_buffer->overlays_before; tail;)
     {
       XSETMISC (overlay, tail);
+
       endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
+      startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
+
+      /* If the overlay is backwards, make it empty.  */
+      if (endpos < startpos)
+        {
+          startpos = endpos;
+          Fset_marker (OVERLAY_START (overlay), make_number (startpos),
+                       Qnil);
+        }
+
       if (endpos < start)
         break;
-      startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
+      
       if (endpos < end
           || (startpos >= start && startpos < end))
         {
-          /* If the overlay is backwards, fix that now.  */
-          if (startpos > endpos)
-            {
-              int tem;
-              Fset_marker (OVERLAY_START (overlay), make_number (endpos),
-                           Qnil);
-              Fset_marker (OVERLAY_END (overlay), make_number (startpos),
-                           Qnil);
-              tem = startpos; startpos = endpos; endpos = tem;
-            }
           /* Add it to the end of the wrong list.  Later on,
              recenter_overlay_lists will move it to the right place.  */
           if (endpos < current_buffer->overlay_center)
@@ -3365,22 +3365,24 @@ fix_start_end_in_overlays (start, end)
   for (parent = NULL, tail = current_buffer->overlays_after; tail;)
     {
       XSETMISC (overlay, tail);
+
       startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
+      endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
+
+      /* If the overlay is backwards, make it empty.  */
+      if (endpos < startpos)
+        {
+          startpos = endpos;
+          Fset_marker (OVERLAY_START (overlay), make_number (startpos),
+                       Qnil);     
+        }
+
       if (startpos >= end)
         break;
-      endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
+
       if (startpos >= start
           || (endpos >= start && endpos < end))
         {
-          if (startpos > endpos)
-            {
-              int tem;
-              Fset_marker (OVERLAY_START (overlay), make_number (endpos),
-                           Qnil);
-              Fset_marker (OVERLAY_END (overlay), make_number (startpos),
-                           Qnil);
-              tem = startpos; startpos = endpos; endpos = tem;
-            }
           if (endpos < current_buffer->overlay_center)
             {
               if (!afterp)
diff --git a/src/xfaces.c b/src/xfaces.c
index 7761282f9eb..2e6d43a54b7 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1,5 +1,5 @@
 /* xfaces.c -- "Face" primitives.
-   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation.
 
 This file is part of GNU Emacs.
@@ -1508,15 +1508,19 @@ face_color_supported_p (f, color_name, background_p)
   XColor not_used;
 
   XSETFRAME (frame, f);
-  return (FRAME_WINDOW_P (f)
-          ? (!NILP (Fxw_display_color_p (frame))
-             || xstricmp (color_name, "black") == 0
-             || xstricmp (color_name, "white") == 0
-             || (background_p
-                 && face_color_gray_p (f, color_name))
-             || (!NILP (Fx_display_grayscale_p (frame))
-                 && face_color_gray_p (f, color_name)))
-          : tty_defined_color (f, color_name, &not_used, 0));
+  return
+#ifdef HAVE_X_WINDOWS
+    FRAME_WINDOW_P (f)
+    ? (!NILP (Fxw_display_color_p (frame))
+       || xstricmp (color_name, "black") == 0
+       || xstricmp (color_name, "white") == 0
+       || (background_p
+           && face_color_gray_p (f, color_name))
+       || (!NILP (Fx_display_grayscale_p (frame))
+           && face_color_gray_p (f, color_name)))
+    :
+#endif
+    tty_defined_color (f, color_name, &not_used, 0);
 }