# HG changeset patch
# User Masatake YAMATO <jet@gyve.org>
# Date 1080237929 0
# Node ID b136a45126094b668835b74df71b2d9fee548d1a
# Parent  f1717549fabeed3c4ff7b57fc0578e3b219d8021
* insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
* buffer.c (fix_start_end_in_overlays): Rename fix_overlays_in_range.
* editfns.c (Ftranspose_regions): Likewise.
* lisp.h (top_level): Likewise.

diff -r f1717549fabe -r b136a4512609 src/ChangeLog
--- a/src/ChangeLog	Thu Mar 25 16:01:38 2004 +0000
+++ b/src/ChangeLog	Thu Mar 25 18:05:29 2004 +0000
@@ -1,3 +1,15 @@
+2004-03-26  Masatake YAMATO  <jet@gyve.org>
+
+	* insdel.c (adjust_markers_for_insert): Call
+	fix_start_end_in_overlays.
+
+	* buffer.c (fix_start_end_in_overlays): Rename
+	fix_overlays_in_range.
+
+	* editfns.c (Ftranspose_regions): Likewise.
+
+	* lisp.h (top_level): Likewise.
+
 2004-03-20  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xterm.c (handle_one_xevent): Do not pass key press events to
diff -r f1717549fabe -r b136a4512609 src/buffer.c
--- a/src/buffer.c	Thu Mar 25 16:01:38 2004 +0000
+++ b/src/buffer.c	Thu Mar 25 18:05:29 2004 +0000
@@ -3293,7 +3293,7 @@
    If so, we'll reverse the endpoints.  Can you think of anything
    better to do in this situation?  */
 void
-fix_overlays_in_range (start, end)
+fix_start_end_in_overlays (start, end)
      register int start, end;
 {
   Lisp_Object overlay;
diff -r f1717549fabe -r b136a4512609 src/editfns.c
--- a/src/editfns.c	Thu Mar 25 16:01:38 2004 +0000
+++ b/src/editfns.c	Thu Mar 25 18:05:29 2004 +0000
@@ -4157,7 +4157,7 @@
       transpose_markers (start1, end1, start2, end2,
 			 start1_byte, start1_byte + len1_byte,
 			 start2_byte, start2_byte + len2_byte);
-      fix_overlays_in_range (start1, end2);
+      fix_start_end_in_overlays (start1, end2);
     }
 
   return Qnil;
diff -r f1717549fabe -r b136a4512609 src/insdel.c
--- a/src/insdel.c	Thu Mar 25 16:01:38 2004 +0000
+++ b/src/insdel.c	Thu Mar 25 18:05:29 2004 +0000
@@ -441,9 +441,13 @@
     }
 
   /* Adjusting only markers whose insertion-type is t may result in
-     disordered overlays in the slot `overlays_before'.  */
+     - disordered start and end in overlays, and 
+     - disordered overlays in the slot `overlays_before' of current_buffer.  */
   if (adjusted)
-    fix_overlays_before (current_buffer, from, to);
+    {
+      fix_start_end_in_overlays(from, to);
+      fix_overlays_before (current_buffer, from, to);
+    }
 }
 
 /* Adjust point for an insertion of NBYTES bytes, which are NCHARS characters.
diff -r f1717549fabe -r b136a4512609 src/lisp.h
--- a/src/lisp.h	Thu Mar 25 16:01:38 2004 +0000
+++ b/src/lisp.h	Thu Mar 25 18:05:29 2004 +0000
@@ -2656,7 +2656,7 @@
 EXFUN (Foverlay_end, 1);
 extern void adjust_overlays_for_insert P_ ((EMACS_INT, EMACS_INT));
 extern void adjust_overlays_for_delete P_ ((EMACS_INT, EMACS_INT));
-extern void fix_overlays_in_range P_ ((int, int));
+extern void fix_start_end_in_overlays P_ ((int, int));
 extern void report_overlay_modification P_ ((Lisp_Object, Lisp_Object, int,
 					     Lisp_Object, Lisp_Object, Lisp_Object));
 extern int overlay_touches_p P_ ((int));