Fix Myanmar OTF support

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;