1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-10 21:50:37 -08:00

(x_load_font): Set 4 instead of -1 in fontp->encoding[1]

for the meaning of `can't decided'.
This commit is contained in:
Kenichi Handa 1997-05-19 03:33:50 +00:00
parent 91a6ba781b
commit ce667c3efe

View file

@ -6491,18 +6491,18 @@ x_load_font (f, fontname, size)
/* The slot `encoding' specifies how to map a character
code-points (0x20..0x7F or 0x2020..0x7F7F) of each charset to
the font code-points (0x20..0x7F, 0xA0..0xFF, 0x2020..0x7F7F,
0xA0A0..0xFFFF, 0x20A0..0x7FFF, or 0xA020..0xFF7F). For the
the font code-points (0:0x20..0x7F, 1:0xA0..0xFF, 0:0x2020..0x7F7F,
1:0xA0A0..0xFFFF, 3:0x20A0..0x7FFF, or 2:0xA020..0xFF7F). For the
moment, we don't know which charset uses this font. So, we set
informatoin in fontp->encoding[1] which is never used by any
charset. If mapping can't be decided, set -1. */
charset. If mapping can't be decided, set 4. */
fontp->encoding[1]
= (font->max_byte1 == 0
/* 1-byte font */
? (font->min_char_or_byte2 < 0x80
? (font->max_char_or_byte2 < 0x80
? 0 /* 0x20..0x7F */
: -1) /* 0x20..0xFF (can't decide) */
: 4) /* 0x20..0xFF (can't decide) */
: 1) /* 0xA0..0xFF */
/* 2-byte font */
: (font->min_byte1 < 0x80
@ -6510,13 +6510,13 @@ x_load_font (f, fontname, size)
? (font->min_char_or_byte2 < 0x80
? (font->max_char_or_byte2 < 0x80
? 0 /* 0x2020..0x7F7F */
: -1) /* 0x2020..0x7FFF (can't decide) */
: 4) /* 0x2020..0x7FFF (can't decide) */
: 3) /* 0x20A0..0x7FFF */
: -1) /* 0x20??..0xA0?? (can't decide) */
: 4) /* 0x20??..0xA0?? (can't decide) */
: (font->min_char_or_byte2 < 0x80
? (font->max_char_or_byte2 < 0x80
? 2 /* 0xA020..0xFF7F */
: -1) /* 0xA020..0xFFFF (can't decide) */
: 4) /* 0xA020..0xFFFF (can't decide) */
: 1))); /* 0xA0A0..0xFFFF */
fontp->baseline_offset