mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00
Code Issues Releases Activity

(reseat_to_string): If STRING is multibyte, set

Browse Source 
the iterator's multibyte_p flag.
This commit is contained in:
Gerd Moellmann 2001-03-28 14:32:24 +00:00
parent a2a15d1a57
commit e719f5aea7
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2001-03-28 Gerd Moellmann <gerd@gnu.org>
* xdisp.c (reseat_to_string): If STRING is multibyte, set
the iterator's multibyte_p flag.
* xfaces.c (realize_basic_faces): Decrement menu_face_change_count
instead of setting it to zero; it's incremented for each frame
where the menu face is changed.

11
src/xdisp.c
View File

@ -3983,8 +3983,11 @@ reseat_to_string (it, s, string, charpos, precision, field_width, multibyte)
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 @@ display_string (string, lisp_string, face_string, face_string_pos,
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);