[Emacs-diffs] /srv/bzr/emacs/trunk r103006: ftfont.c (ftfont_spec_pattern): Check each extra property value.

[Kenichi Handa]

------------------------------------------------------------
revno: 103006 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Fri 2011-01-28 21:36:47 +0900
message:
  ftfont.c (ftfont_spec_pattern): Check each extra property value.
modified:
  src/ChangeLog
  src/ftfont.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-28 04:53:17 +0000
+++ b/src/ChangeLog     2011-01-28 12:31:39 +0000
@@ -1,3 +1,8 @@
+2011-01-28  Kenichi Handa  <address@hidden>
+
+       * ftfont.c (ftfont_spec_pattern): Check each extra property
+       value.
+
 2011-01-28  Stefan Monnier  <address@hidden>
 
        * xdisp.c (safe_eval_handler): Distinguish symbols and strings.

=== modified file 'src/ftfont.c'
--- a/src/ftfont.c      2011-01-25 04:08:28 +0000
+++ b/src/ftfont.c      2011-01-28 12:31:34 +0000
@@ -749,7 +749,10 @@
 
       key = XCAR (XCAR (extra)), val = XCDR (XCAR (extra));
       if (EQ (key, QCdpi))
-       dpi = XINT (val);
+       {
+         if (INTEGERP (val))
+           dpi = XINT (val);
+       }
       else if (EQ (key, QClang))
        {
          if (! langset)
@@ -769,12 +772,15 @@
        }
       else if (EQ (key, QCotf))
        {
-         *otspec = ftfont_get_open_type_spec (val);
-         if (! *otspec)
-           return NULL;
-         strcat (otlayout, "otlayout:");
-         OTF_TAG_STR ((*otspec)->script_tag, otlayout + 9);
-         script = (*otspec)->script;
+         if (CONSP (val))
+           {
+             *otspec = ftfont_get_open_type_spec (val);
+             if (! *otspec)
+               return NULL;
+             strcat (otlayout, "otlayout:");
+             OTF_TAG_STR ((*otspec)->script_tag, otlayout + 9);
+             script = (*otspec)->script;
+           }
        }
       else if (EQ (key, QCscript))
        script = val;