* src/buffer.c (Fmake_overlay): Fix last change.

(fix_start_end_in_overlays): Remove redundant recentering.

diff --git a/src/ChangeLog b/src/ChangeLog
index 507fe80c8abf9efcc232a8b5a472998dd9f92048..a199a7b12e50b21b49e7d844caed29a79e1d1e20 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,7 @@
 
        * buffer.c (Fset_buffer_multibyte): Signal an error instead of widening.
        (Fmake_overlay): Remove redundant tests.
+       (fix_start_end_in_overlays): Remove redundant recentering.
 
 2012-10-02  Juanma Barranquero  <lekktu@gmail.com>
 

diff --git a/src/buffer.c b/src/buffer.c
index 6925675fd5aa522bc3f9a16a5c6f97980c287bce..425d05ca790cd181096695ed0a1fa125a71d0e15 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3689,7 +3689,6 @@ fix_start_end_in_overlays (register ptrdiff_t start, register ptrdiff_t end)
       beforep->next = current_buffer->overlays_before;
       set_buffer_overlays_before (current_buffer, before_list);
     }
-  recenter_overlay_lists (current_buffer, current_buffer->overlay_center);
 
   if (afterp)
     {
@@ -3847,13 +3846,13 @@ for the rear of the overlay advance when text is inserted there
   end = OVERLAY_END (overlay);
   if (OVERLAY_POSITION (end) < b->overlay_center)
     {
-      eassert (b->overlays_after);
+      eassert (b->overlays_after || (XOVERLAY (overlay)->next == NULL));
       XOVERLAY (overlay)->next = b->overlays_after;
       set_buffer_overlays_after (b, XOVERLAY (overlay));
     }
   else
     {
-      eassert (b->overlays_before);
+      eassert (b->overlays_before || (XOVERLAY (overlay)->next == NULL));
       XOVERLAY (overlay)->next = b->overlays_before;
       set_buffer_overlays_before (b, XOVERLAY (overlay));
     }