Mercurial > emacs
changeset 29613:7da06cd67660
(IT_write_glyphs): Don't use CODING_REQUIRE_ENCODING
macro, instead AND with CODING_REQUIRE_ENCODING_MASK.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Tue, 13 Jun 2000 13:04:19 +0000 |
| parents | d4871efe0496 |
| children | 356975f21b18 |
| files | src/msdos.c |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/msdos.c Tue Jun 13 11:07:01 2000 +0000 +++ b/src/msdos.c Tue Jun 13 13:04:19 2000 +0000 @@ -890,9 +890,13 @@ 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