(display_mode_element): When computing charpos, depend

on multibyteness of elt, not the text in field.

diff --git a/src/ChangeLog b/src/ChangeLog
index c05c308e490da2062d8acf12e22d966a7d201745..272b0283e1a5faaf31a4130a616ba71ecce9aa04 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-15  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * xdisp.c (display_mode_element): When computing charpos, depend
+       on multibyteness of elt, not the text in field.
+
 2002-01-14  Andreas Schwab  <schwab@suse.de>
 
        * unexelf.c [!defined MAP_ANON]: Define MAP_ANON to MAP_ANONYMOUS

diff --git a/src/xdisp.c b/src/xdisp.c
index 6a5714ee8ef725356cfff0a9366de397abc1ed5b..87e0ca6125756ad8ce3bb41003d2fd3a19e323ad 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13573,7 +13573,7 @@ display_mode_element (it, depth, field_width, precision, elt)
                        
                        nglyphs_before = it->glyph_row->used[TEXT_AREA];
                        bytepos = percent_position - XSTRING (elt)->data;
-                       charpos = (multibyte
+                       charpos = (STRING_MULTIBYTE (elt)
                                   ? string_byte_to_char (elt, bytepos)
                                   : bytepos);
                        nwritten = display_string (spec, Qnil, elt,