(x_produce_glyphs): Use ASCII_CHAR_P, not

SINGLE_BYTE_CHAR_P.  Fix the logic of handling non-ASCII char when
it->multibyte_p is zero.

diff --git a/src/w32term.c b/src/w32term.c
index c22fb1775a6a69b476ac95e96fd5f6bc1c3146cd..222bc96a35bf839c5a465971a803f7f8bc3a9a89 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2040,22 +2040,14 @@ x_produce_glyphs (it)
       /* Maybe translate single-byte characters to multibyte, or the
          other way.  */
       it->char_to_display = it->c;
-      if (!ASCII_BYTE_P (it->c))
+      if (!ASCII_CHAR_P (it->c))
         {
-          if (unibyte_display_via_language_environment
-              && SINGLE_BYTE_CHAR_P (it->c)
-              && (it->c >= 0240
-                  || !NILP (Vnonascii_translation_table)))
-            {
-              it->char_to_display = unibyte_char_to_multibyte (it->c);
-              it->multibyte_p = 1;
-             it->face_id = FACE_FOR_CHAR (it->f, face, it->char_to_display);
-             face = FACE_FROM_ID (it->f, it->face_id);
-           }
-         else if (!SINGLE_BYTE_CHAR_P (it->c)
-                  && !it->multibyte_p)
+         if (SINGLE_BYTE_CHAR_P (it->c)
+             && unibyte_display_via_language_environment)
+           it->char_to_display = unibyte_char_to_multibyte (it->c);
+         if (! SINGLE_BYTE_CHAR_P (it->c))
            {
-              it->multibyte_p = 1;
+             it->multibyte_p = 1;
              it->face_id = FACE_FOR_CHAR (it->f, face, it->char_to_display);
              face = FACE_FROM_ID (it->f, it->face_id);
            }