diff options
| author | Stefan Monnier | 2009-11-24 21:33:23 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2009-11-24 21:33:23 +0000 |
| commit | 28259cac7074d41fe11603fc3f0954397036583e (patch) | |
| tree | dbfd199853354201705472e546aa214335901c92 /src | |
| parent | bb301b9aff1ccb7a28e4f9bae3adef3f03d2b3e4 (diff) | |
| download | emacs-28259cac7074d41fe11603fc3f0954397036583e.tar.gz emacs-28259cac7074d41fe11603fc3f0954397036583e.zip | |
(adjust_markers_for_delete): Move it in the right direction! (bug#4803)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/insdel.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e8df7f71cca..865b6a4c635 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-11-24 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * insdel.c (adjust_markers_for_delete): Move it in the | ||
| 4 | right direction! (bug#4803) | ||
| 5 | |||
| 1 | 2009-11-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 6 | 2009-11-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 7 | ||
| 3 | * font.c (font_open_entity): Don't use ASET if font_object is Qnil. | 8 | * font.c (font_open_entity): Don't use ASET if font_object is Qnil. |
diff --git a/src/insdel.c b/src/insdel.c index 0ab199ab1c7..91c5e05d629 100644 --- a/src/insdel.c +++ b/src/insdel.c | |||
| @@ -370,14 +370,14 @@ adjust_markers_for_delete (EMACS_INT from, EMACS_INT from_byte, | |||
| 370 | re-inserted text after undoing a deletion, and must be | 370 | re-inserted text after undoing a deletion, and must be |
| 371 | adjusted to move them to the correct place. */ | 371 | adjusted to move them to the correct place. */ |
| 372 | XSETMISC (marker, m); | 372 | XSETMISC (marker, m); |
| 373 | record_marker_adjustment (marker, from - charpos); | 373 | record_marker_adjustment (marker, from - charpos); |
| 374 | } | 374 | } |
| 375 | else if (charpos < to) | 375 | else if (charpos < to) |
| 376 | { /* Before-insertion markers will automatically move forward | 376 | { /* Before-insertion markers will automatically move forward |
| 377 | upon re-inserting the deleted text, so we have to arrange | 377 | upon re-inserting the deleted text, so we have to arrange |
| 378 | for them to move backward to the correct position. */ | 378 | for them to move backward to the correct position. */ |
| 379 | XSETMISC (marker, m); | 379 | XSETMISC (marker, m); |
| 380 | record_marker_adjustment (marker, charpos - to); | 380 | record_marker_adjustment (marker, to - charpos); |
| 381 | } | 381 | } |
| 382 | m->charpos = from; | 382 | m->charpos = from; |
| 383 | m->bytepos = from_byte; | 383 | m->bytepos = from_byte; |