diff options
| author | Stefan Monnier | 2012-10-01 22:43:53 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-10-01 22:43:53 -0400 |
| commit | 64edc7770f7fe5d6912c5f950fb998ae255415d3 (patch) | |
| tree | 43e07c9b87e76f876888d38a0688c4beeeecd183 /src | |
| parent | cd38666213d8badc14fb547ba1b8b9f258fd1189 (diff) | |
| download | emacs-64edc7770f7fe5d6912c5f950fb998ae255415d3.tar.gz emacs-64edc7770f7fe5d6912c5f950fb998ae255415d3.zip | |
* src/buffer.c (Fmake_overlay): Fix last change.
(fix_start_end_in_overlays): Remove redundant recentering.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/buffer.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 507fe80c8ab..a199a7b12e5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | * buffer.c (Fset_buffer_multibyte): Signal an error instead of widening. | 8 | * buffer.c (Fset_buffer_multibyte): Signal an error instead of widening. |
| 9 | (Fmake_overlay): Remove redundant tests. | 9 | (Fmake_overlay): Remove redundant tests. |
| 10 | (fix_start_end_in_overlays): Remove redundant recentering. | ||
| 10 | 11 | ||
| 11 | 2012-10-02 Juanma Barranquero <lekktu@gmail.com> | 12 | 2012-10-02 Juanma Barranquero <lekktu@gmail.com> |
| 12 | 13 | ||
diff --git a/src/buffer.c b/src/buffer.c index 6925675fd5a..425d05ca790 100644 --- 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) | |||
| 3689 | beforep->next = current_buffer->overlays_before; | 3689 | beforep->next = current_buffer->overlays_before; |
| 3690 | set_buffer_overlays_before (current_buffer, before_list); | 3690 | set_buffer_overlays_before (current_buffer, before_list); |
| 3691 | } | 3691 | } |
| 3692 | recenter_overlay_lists (current_buffer, current_buffer->overlay_center); | ||
| 3693 | 3692 | ||
| 3694 | if (afterp) | 3693 | if (afterp) |
| 3695 | { | 3694 | { |
| @@ -3847,13 +3846,13 @@ for the rear of the overlay advance when text is inserted there | |||
| 3847 | end = OVERLAY_END (overlay); | 3846 | end = OVERLAY_END (overlay); |
| 3848 | if (OVERLAY_POSITION (end) < b->overlay_center) | 3847 | if (OVERLAY_POSITION (end) < b->overlay_center) |
| 3849 | { | 3848 | { |
| 3850 | eassert (b->overlays_after); | 3849 | eassert (b->overlays_after || (XOVERLAY (overlay)->next == NULL)); |
| 3851 | XOVERLAY (overlay)->next = b->overlays_after; | 3850 | XOVERLAY (overlay)->next = b->overlays_after; |
| 3852 | set_buffer_overlays_after (b, XOVERLAY (overlay)); | 3851 | set_buffer_overlays_after (b, XOVERLAY (overlay)); |
| 3853 | } | 3852 | } |
| 3854 | else | 3853 | else |
| 3855 | { | 3854 | { |
| 3856 | eassert (b->overlays_before); | 3855 | eassert (b->overlays_before || (XOVERLAY (overlay)->next == NULL)); |
| 3857 | XOVERLAY (overlay)->next = b->overlays_before; | 3856 | XOVERLAY (overlay)->next = b->overlays_before; |
| 3858 | set_buffer_overlays_before (b, XOVERLAY (overlay)); | 3857 | set_buffer_overlays_before (b, XOVERLAY (overlay)); |
| 3859 | } | 3858 | } |