diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-05-07 13:41:54 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-05-07 13:41:54 -0400 |
| commit | 32cf07819ae8cfdbf14e00f351c7f520fff325c3 (patch) | |
| tree | 029f5e0b51aa8052bba25d79bb9fba9fb42ecee6 /src/buffer.c | |
| parent | 81d83cf6357c73ac5e8de8aeac9760ab00f5af0a (diff) | |
| download | emacs-32cf07819ae8cfdbf14e00f351c7f520fff325c3.tar.gz | |
* src/marker.c (buf_bytepos_to_charpos): Re-add the CHAR_HEAD_P assertion
This assertion was removed in 1c349c62305d432abf0fa2b6e3f5d754fe4cab79
because the assumption was invalid during set_intervals_multibyte_1.
So we change set_intervals_multibyte_1 to solve the problem in the same
way as in the rest of Fset_buffer_multibyte, which actually simplifies
the code.
* src/buffer.c (advance_to_char_boundary): Not static any more.
* src/buffer.h (advance_to_char_boundary): Add prototype.
* src/intervals.c (set_intervals_multibyte_1): Use it.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index ab477481912..3b5078a175b 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2264,7 +2264,7 @@ validate_region (register Lisp_Object *b, register Lisp_Object *e) /* Advance BYTE_POS up to a character boundary and return the adjusted position. */ -static ptrdiff_t +ptrdiff_t advance_to_char_boundary (ptrdiff_t byte_pos) { int c; @@ -2702,6 +2702,9 @@ current buffer is cleared. */) /* Do this last, so it can calculate the new correspondences between chars and bytes. */ + /* FIXME: Is it worth the trouble, really? Couldn't we just throw + away all the text-properties instead of trying to guess how + to adjust them? AFAICT the result is not reliable anyway. */ set_intervals_multibyte (1); } |