# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 985789916 0
# Node ID 9adfbb593c576f0cead5f63f543b2217aa06f25c
# Parent  528310f62c346df3294b0eb7632becaaeadd318b
(reseat_to_string): If STRING is multibyte, set
the iterator's multibyte_p flag.

diff -r 528310f62c34 -r 9adfbb593c57 src/xdisp.c
--- a/src/xdisp.c	Wed Mar 28 12:50:35 2001 +0000
+++ b/src/xdisp.c	Wed Mar 28 14:31:56 2001 +0000
@@ -3983,8 +3983,11 @@
   it->current.dpvec_index = -1;
   xassert (charpos >= 0);
   
-  /* Use the setting of MULTIBYTE if specified.  */
-  if (multibyte >= 0)
+  /* If STRING is specified, use its multibyteness, otherwise use the
+     setting of MULTIBYTE, if specified.  */
+  if (STRINGP (string))
+    it->multibyte_p = STRING_MULTIBYTE (string);
+  else if (multibyte >= 0)
     it->multibyte_p = multibyte > 0;
   
   if (s == NULL)
@@ -13943,9 +13946,7 @@
   struct glyph_row *row = it->glyph_row;
 
   /* Initialize the iterator IT for iteration over STRING beginning
-     with index START.  We assume that IT may be modified here (which
-     means that display_line has to do something when displaying a
-     mini-buffer prompt, which it does).  */
+     with index START.  */
   reseat_to_string (it, string, lisp_string, start,
 		    precision, field_width, multibyte);