aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-09-13 13:05:37 +0000
committerGerd Moellmann2001-09-13 13:05:37 +0000
commit06fd37928647545543f38e46c115406add2339e2 (patch)
tree5a473fefd943bc556cfe7bdce243b575061b9541 /src
parent4c8c7926fde857a7883ca8b3bf1565e1faff0245 (diff)
downloademacs-06fd37928647545543f38e46c115406add2339e2.tar.gz
emacs-06fd37928647545543f38e46c115406add2339e2.zip
(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/ChangeLog4
-rw-r--r--src/xdisp.c1
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 @@
12001-09-13 Gerd Moellmann <gerd@gnu.org> 12001-09-13 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xdisp.c (reseat_1): Set IT's multibyte_p flag according to the
4 current buffer's multibyteness when discarding the iterator's
5 stack.
6
3 * xfns.c (Fx_window_property): Handle case that property gets 7 * xfns.c (Fx_window_property): Handle case that property gets
4 deleted between the two calls to XGetWindowProperty. 8 deleted between the two calls to XGetWindowProperty.
5 9
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)
4039 IT_STRING_BYTEPOS (*it) = -1; 4039 IT_STRING_BYTEPOS (*it) = -1;
4040 it->string = Qnil; 4040 it->string = Qnil;
4041 it->method = next_element_from_buffer; 4041 it->method = next_element_from_buffer;
4042 it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
4042 it->sp = 0; 4043 it->sp = 0;
4043 it->face_before_selective_p = 0; 4044 it->face_before_selective_p = 0;
4044 4045