From e023fb278c4294fb91a0816ae161d72b497b3935 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 13 Jun 2000 13:04:19 +0000 Subject: [PATCH] (IT_write_glyphs): Don't use CODING_REQUIRE_ENCODING macro, instead AND with CODING_REQUIRE_ENCODING_MASK. --- src/msdos.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/msdos.c b/src/msdos.c index d15af6bc633..7545cd8bc6c 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -890,9 +890,13 @@ IT_write_glyphs (struct glyph *str, int str_len) register int tlen = GLYPH_TABLE_LENGTH; register Lisp_Object *tbase = GLYPH_TABLE_BASE; - struct coding_system *coding = (CODING_REQUIRE_ENCODING (&terminal_coding) - ? &terminal_coding - : &safe_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 returns 1 if terminal_coding.src_multibyte is 1. */ + struct coding_system *coding = + (terminal_coding.common_flags & CODING_REQUIRE_ENCODING_MASK + ? &terminal_coding + : &safe_terminal_coding); struct frame *sf; /* Do we need to consider conversion of unibyte characters to -- 2.39.2