(reseat_1): Set IT's multibyte_p flag according to the

current buffer's multibyteness when discarding the iterator's
stack.

diff --git a/src/ChangeLog b/src/ChangeLog
index c385f14159617d52082ec217faeec4758219c772..d1741c8a7ce70b243607818bb61d5ba189a6274e 100644 (file)
--- 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 c0659ed26ff835d784a3ae1aa73fd1f97015d25e..a3ac927f785ddb5711549eb6e1ef34abbd354d18 100644 (file)
--- 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;