(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 26c7886569599f01e52b25e86fb1a88587bc8e0e..98a6c7184bfcbe6d21c23719fa50a2f9cb8262f1 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 multibytenes of elt, not the text in field.
+
 2002-01-15  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * buffer.c (Fkill_all_local_variables): Increment

diff --git a/src/xdisp.c b/src/xdisp.c
index d7491121ee0b7e3a4a0a1e4b9389edffb319ddaa..694935c9c0292a30614f8c326c702bf6ba697439 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13607,7 +13607,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,