(fs_load_font): By default, use 0x00..0x7f for ASCII.

Check Vfont_encoding_alist against the full name of the opened
font.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/fontset.c b/src/fontset.c
index 7d0e67983e7..aa92cf931c8 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -655,8 +655,10 @@ fs_load_font (f, c, fontname, id, face)
       /* The font itself doesn't have information about encoding.  */
       int i;
 
-      /* At first, set 1 (means 0xA0..0xFF) as the default.  */
-      fontp->encoding[0] = 1;
+      fontname = fontp->full_name;
+      /* By default, encoding of ASCII chars is 0 (i.e. 0x00..0x7F),
+         others is 1 (i.e. 0x80..0xFF).  */
+      fontp->encoding[0] = 0;
       for (i = MIN_CHARSET_OFFICIAL_DIMENSION1; i <= MAX_CHARSET; i++)
         fontp->encoding[i] = 1;
       /* Then override them by a specification in Vfont_encoding_alist.  */