masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-12 07:00:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merging of region face for non-ASCII characters

Browse source 
* src/xdisp.c (extend_face_to_end_of_line): Restore the correct
original face used by the iterator on this line, not the ASCII
face.  (Bug#43363)
This commit is contained in:
Eli Zaretskii 2020-10-05 12:34:22 +03:00
parent c2a13969e4
commit acc9b46153
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/xdisp.c
View file

@ -21808,13 +21808,14 @@ extend_face_to_end_of_line (struct it *it)
in the text area has to be drawn to the end of the text area. */ in the text area has to be drawn to the end of the text area. */
it->glyph_row->fill_line_p = true; it->glyph_row->fill_line_p = true;
const int orig_face_id = it->face_id;
/* If current character of IT is not ASCII, make sure we have the /* If current character of IT is not ASCII, make sure we have the
ASCII face. This will be automatically undone the next time ASCII face. This will be automatically undone the next time
get_next_display_element returns a multibyte character. Note get_next_display_element returns a multibyte character. Note
that the character will always be single byte in unibyte that the character will always be single byte in unibyte
text. */ text. */
if (!ASCII_CHAR_P (it->c)) if (!ASCII_CHAR_P (it->c))
it->face_id = FACE_FOR_CHAR (f, face, 0, -1, Qnil); it->face_id = FACE_FOR_CHAR (f, face, 0, -1, Qnil);
/* The default face, possibly remapped. */ /* The default face, possibly remapped. */
struct face *default_face = struct face *default_face =
@ -22008,6 +22009,7 @@ extend_face_to_end_of_line (struct it *it)
if (stretch_width < 0) if (stretch_width < 0)
it->glyph_row->x = stretch_width; it->glyph_row->x = stretch_width;
} }
it->face_id = orig_face_id;
} }
else else
#endif /* HAVE_WINDOW_SYSTEM */ #endif /* HAVE_WINDOW_SYSTEM */
@ -22017,7 +22019,6 @@ extend_face_to_end_of_line (struct it *it)
struct text_pos saved_pos = it->position; struct text_pos saved_pos = it->position;
Lisp_Object saved_object = it->object;; Lisp_Object saved_object = it->object;;
enum display_element_type saved_what = it->what; enum display_element_type saved_what = it->what;
int saved_face_id = it->face_id;
it->what = IT_CHARACTER; it->what = IT_CHARACTER;
memset (&it->position, 0, sizeof it->position); memset (&it->position, 0, sizeof it->position);
@ -22120,7 +22121,7 @@ extend_face_to_end_of_line (struct it *it)
it->object = saved_object; it->object = saved_object;
it->position = saved_pos; it->position = saved_pos;
it->what = saved_what; it->what = saved_what;
it->face_id = saved_face_id; it->face_id = orig_face_id;
} }
} }