diff options
| author | Kenichi Handa | 2008-12-10 06:01:44 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2008-12-10 06:01:44 +0000 |
| commit | 7b6494787af7c4f93a860501ab0aab7f0118cf87 (patch) | |
| tree | ddb1905488fe0e4c876cb47d0d4f939d1791631b /src | |
| parent | fb2facde09b87a04c4750ec48cf7c5959ff8444d (diff) | |
| download | emacs-7b6494787af7c4f93a860501ab0aab7f0118cf87.tar.gz emacs-7b6494787af7c4f93a860501ab0aab7f0118cf87.zip | |
(fc_charset_table): Add "unicode-sip".
(ftfont_spec_pattern): Lookup fc_charset_table for the regisry
Qunicode_sip.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/ftfont.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bf7a551c7c3..a68f44d6c22 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-12-10 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * ftfont.c (fc_charset_table): Add "unicode-sip". | ||
| 4 | (ftfont_spec_pattern): Lookup fc_charset_table for the regisry | ||
| 5 | Qunicode_sip. | ||
| 6 | |||
| 1 | 2008-12-10 Juanma Barranquero <lekktu@gmail.com> | 7 | 2008-12-10 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 8 | ||
| 3 | * coding.c (QCdefault_char): Rename from QCdefalut_char. | 9 | * coding.c (QCdefault_char): Rename from QCdefalut_char. |
diff --git a/src/ftfont.c b/src/ftfont.c index 7d746ec2908..6cf91bd4131 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -128,6 +128,7 @@ static struct | |||
| 128 | { "windows-1251", { 0x0401, 0x0490 }, "ru"}, | 128 | { "windows-1251", { 0x0401, 0x0490 }, "ru"}, |
| 129 | { "koi8-r", { 0x0401, 0x2219 }, "ru"}, | 129 | { "koi8-r", { 0x0401, 0x2219 }, "ru"}, |
| 130 | { "mulelao-1", { 0x0E81 }, "lo"}, | 130 | { "mulelao-1", { 0x0E81 }, "lo"}, |
| 131 | { "unicode-sip", { 0x20000 }}, | ||
| 131 | { NULL } | 132 | { NULL } |
| 132 | }; | 133 | }; |
| 133 | 134 | ||
| @@ -607,8 +608,7 @@ ftfont_spec_pattern (spec, otlayout, otspec) | |||
| 607 | if (NILP (registry) | 608 | if (NILP (registry) |
| 608 | || EQ (registry, Qascii_0) | 609 | || EQ (registry, Qascii_0) |
| 609 | || EQ (registry, Qiso10646_1) | 610 | || EQ (registry, Qiso10646_1) |
| 610 | || EQ (registry, Qunicode_bmp) | 611 | || EQ (registry, Qunicode_bmp)) |
| 611 | || EQ (registry, Qunicode_sip)) | ||
| 612 | fc_charset_idx = -1; | 612 | fc_charset_idx = -1; |
| 613 | else | 613 | else |
| 614 | { | 614 | { |