Mercurial > emacs
changeset 46168:56be68853618
2002-07-03 Andrew Choi <akochoi@shaw.ca>
* macterm.c (init_font_name_table): Also add entry for
jisx0201.1976-0 coding for Japanese font.
(XLoadQueryFont): Use it.
| author | Andrew Choi <akochoi@shaw.ca> |
|---|---|
| date | Thu, 04 Jul 2002 02:10:45 +0000 |
| parents | a3ecd7edc382 |
| children | 36989d5089ee |
| files | src/ChangeLog src/macterm.c |
| diffstat | 2 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jul 03 18:42:34 2002 +0000 +++ b/src/ChangeLog Thu Jul 04 02:10:45 2002 +0000 @@ -1,3 +1,9 @@ +2002-07-03 Andrew Choi <akochoi@shaw.ca> + + * macterm.c (init_font_name_table): Also add entry for + jisx0201.1976-0 coding for Japanese font. + (XLoadQueryFont): Use it. + 2002-07-02 Richard M. Stallman <rms@gnu.org> * keymap.c (Fdefine_key): Doc fix.
--- a/src/macterm.c Wed Jul 03 18:42:34 2002 +0000 +++ b/src/macterm.c Thu Jul 04 02:10:45 2002 +0000 @@ -10747,8 +10747,14 @@ sc)); } else - add_font_name_table_entry (mac_to_x_fontname (name, size, style, - sc)); + { + add_font_name_table_entry (mac_to_x_fontname (name, size, + style, sc)); + if (smJapanese == sc) + add_font_name_table_entry (mac_to_x_fontname (name, size, + style, + -smJapanese)); + } } /* Dispose of the iterators. */ @@ -10833,7 +10839,7 @@ = mac_to_x_fontname (name, assc_entry->fontSize, assc_entry->fontStyle, - smRoman); + -smJapanese); } } } @@ -11105,7 +11111,7 @@ if (sscanf (name, "-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]--%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s", cs) == 1 - && 0 == strcmp (cs, "mac-roman")) + && 0 == strcmp (cs, "jisx0201.1976-0")) font->mac_scriptcode = smRoman; }