diff options
| author | Kenichi Handa <handa@m17n.org> | 2010-02-26 21:40:46 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2010-02-26 21:40:46 +0900 |
| commit | f88cc4d6dd9ca8cfbae25aa1d8f1912d54444aca (patch) | |
| tree | 38e85e04327f47e615cf2abc5ba920a849bb0425 /src | |
| parent | 06aac9016fc074f856a4b374572024a68784e630 (diff) | |
| download | emacs-f88cc4d6dd9ca8cfbae25aa1d8f1912d54444aca.tar.gz | |
Fix Myanmar OTF support
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/ftfont.c | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 36e056b786d..f60b400b930 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2010-02-26 Kenichi Handa <handa@m17n.org> + * ftfont.c (ftfont_get_open_type_spec): Fix parsing of otf_spec. + * xdisp.c (reseat_to_string): Fix previous change. 2010-02-26 David Reitter <david.reitter@gmail.com> diff --git a/src/ftfont.c b/src/ftfont.c index 492d03bb8bf..f4fe5b8e5c0 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -663,19 +663,19 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec) else spec->script_tag = 0x44464C54; /* "DFLT" */ otf_spec = XCDR (otf_spec); - val = XCAR (otf_spec); - if (! NILP (val)) - OTF_SYM_TAG (val, spec->langsys_tag); - else - spec->langsys_tag = 0; + spec->langsys_tag = 0; + if (! NILP (otf_spec)) + { + val = XCAR (otf_spec); + if (! NILP (val)) + OTF_SYM_TAG (val, spec->langsys_tag); + otf_spec = XCDR (otf_spec); + } spec->nfeatures[0] = spec->nfeatures[1] = 0; - for (i = 0; i < 2; i++) + for (i = 0; i < 2 && ! NILP (otf_spec); i++, otf_spec = XCDR (otf_spec)) { Lisp_Object len; - otf_spec = XCDR (otf_spec); - if (NILP (otf_spec)) - break; val = XCAR (otf_spec); if (NILP (val)) continue; |