From 1ac0700a34bcf0b98cf79a4cf42413a378b5e8ad Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Tue, 6 Jun 2000 01:08:19 +0000 Subject: [PATCH] (encode_terminal_code): Change the way to check if terminal coding does any conversion. (append_glyph): Set glyph->pixel_width correctly. --- src/term.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/term.c b/src/term.c index 672eee22c6c..d21b78c6b62 100644 --- a/src/term.c +++ b/src/term.c @@ -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; -- 2.39.2