aboutsummaryrefslogtreecommitdiffstats
path: root/src/ftfont.c
diff options
context:
space:
mode:
authorKenichi Handa <[email protected]>2010-02-26 21:40:46 +0900
committerKenichi Handa <[email protected]>2010-02-26 21:40:46 +0900
commitf88cc4d6dd9ca8cfbae25aa1d8f1912d54444aca (patch)
tree38e85e04327f47e615cf2abc5ba920a849bb0425 /src/ftfont.c
parent06aac9016fc074f856a4b374572024a68784e630 (diff)
Fix Myanmar OTF support
Diffstat (limited to 'src/ftfont.c')
-rw-r--r--src/ftfont.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ftfont.c b/src/ftfont.c
index 492d03bb8b..f4fe5b8e5c 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;