diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-09-13 13:05:37 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-09-13 13:05:37 +0000 |
| commit | 06fd37928647545543f38e46c115406add2339e2 (patch) | |
| tree | 5a473fefd943bc556cfe7bdce243b575061b9541 /src | |
| parent | 4c8c7926fde857a7883ca8b3bf1565e1faff0245 (diff) | |
| download | emacs-06fd37928647545543f38e46c115406add2339e2.tar.gz | |
(reseat_1): Set IT's multibyte_p flag according to the
current buffer's multibyteness when discarding the iterator's
stack.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c385f141596..d1741c8a7ce 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2001-09-13 Gerd Moellmann <gerd@gnu.org> + * xdisp.c (reseat_1): Set IT's multibyte_p flag according to the + current buffer's multibyteness when discarding the iterator's + stack. + * xfns.c (Fx_window_property): Handle case that property gets deleted between the two calls to XGetWindowProperty. diff --git a/src/xdisp.c b/src/xdisp.c index c0659ed26ff..a3ac927f785 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4039,6 +4039,7 @@ reseat_1 (it, pos, set_stop_p) IT_STRING_BYTEPOS (*it) = -1; it->string = Qnil; it->method = next_element_from_buffer; + it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); it->sp = 0; it->face_before_selective_p = 0; |