mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-27 15:52:00 -08:00
(encode_terminal_code): Change the way to check if
terminal coding does any conversion. (append_glyph): Set glyph->pixel_width correctly.
This commit is contained in:
parent
1969fae27a
commit
1ac0700a34
1 changed files with 5 additions and 2 deletions
|
|
@ -954,7 +954,10 @@ encode_terminal_code (src, dst, src_len, dst_len, consumed)
|
|||
int result;
|
||||
struct coding_system *coding;
|
||||
|
||||
coding = (CODING_REQUIRE_ENCODING (&terminal_coding)
|
||||
/* If terminal_coding does any conversion, use it, otherwise use
|
||||
safe_terminal_coding. We can't use CODING_REQUIRE_ENCODING here
|
||||
because it always return 1 if the member src_multibyte is 1. */
|
||||
coding = (terminal_coding.common_flags & CODING_REQUIRE_ENCODING_MASK
|
||||
? &terminal_coding
|
||||
: &safe_terminal_coding);
|
||||
|
||||
|
|
@ -1780,7 +1783,7 @@ append_glyph (it)
|
|||
++i)
|
||||
{
|
||||
glyph->type = CHAR_GLYPH;
|
||||
glyph->pixel_width = 1;
|
||||
glyph->pixel_width = it->pixel_width;
|
||||
glyph->u.ch = it->c;
|
||||
glyph->face_id = it->face_id;
|
||||
glyph->padding_p = i > 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue