[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110334: * src/buffer.c (Fmake_overla
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110334: * src/buffer.c (Fmake_overlay): Fix last change. |
Date: |
Mon, 01 Oct 2012 22:43:53 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110334
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-01 22:43:53 -0400
message:
* src/buffer.c (Fmake_overlay): Fix last change.
(fix_start_end_in_overlays): Remove redundant recentering.
modified:
src/ChangeLog
src/buffer.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-10-02 00:31:56 +0000
+++ b/src/ChangeLog 2012-10-02 02:43:53 +0000
@@ -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 <address@hidden>
=== modified file 'src/buffer.c'
--- a/src/buffer.c 2012-10-02 00:31:56 +0000
+++ b/src/buffer.c 2012-10-02 02:43:53 +0000
@@ -3689,7 +3689,6 @@
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 @@
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));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110334: * src/buffer.c (Fmake_overlay): Fix last change.,
Stefan Monnier <=