Mercurial > emacs
changeset 54555:b136a4512609
* 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.
| author | Masatake YAMATO <jet@gyve.org> |
|---|---|
| date | Thu, 25 Mar 2004 18:05:29 +0000 |
| parents | f1717549fabe |
| children | 96f4b4c88092 108bb5537c12 |
| files | src/ChangeLog src/buffer.c src/editfns.c src/insdel.c src/lisp.h |
| diffstat | 5 files changed, 21 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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;
--- 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;
--- 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.
--- 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));