From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 15 Jan 2002 17:30:41 +0000 (+0000)
Subject: (display_mode_element): When computing charpos, depend
X-Git-Tag: emacs-21.2~186
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bfdbf2ef9de4e3578748369d8ff1cccf246a05bf;p=emacs.git

(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 c05c308e490..272b0283e1a 100644
--- 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 6a5714ee8ef..87e0ca61257 100644
--- 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,