Mercurial > emacs
changeset 37039:9adfbb593c57
(reseat_to_string): If STRING is multibyte, set
the iterator's multibyte_p flag.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 28 Mar 2001 14:31:56 +0000 |
| parents | 528310f62c34 |
| children | 0c7a504e8522 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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);