(font_prop_validate_style): Adjusted for the format

change of font_style_table.

diff --git a/src/ChangeLog b/src/ChangeLog
index 77e7dc86bdb1ab4e3416ed93c7a15cbde36a2c33..f9ed2746df3bb6b73ffb5893d9b0c09e005b03e2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-22  Kenichi Handa  <handa@m17n.org>
 
+       * font.c (font_prop_validate_style): Adjusted for the format
+       change of font_style_table.
+
        * w32font.c (w32font_open_internal): Call Ffont_xlfd_name with
        two args.
 
@@ -40,21 +43,21 @@
 
        * font.c: Checking of FONT_DEBUG is moved to font.h.  All calls of
        xassert are changed to font_assert.  Delete many unused variables.
-       (Vfont_weight_table, Vfont_slant_table, Vfont_width_table):
-       New variables.
+       (Vfont_weight_table, Vfont_slant_table, Vfont_width_table): New
+       variables.
        (struct table_entry): Move from xfaces.c and modified.
        (weight_table, slant_table, width_table): Move from xfaces.c and
        contents adjusted for the change of struct table_entry.
-       (font_style_to_value, font_style_symbolic): Adjut for the format
-       change of font_style_table.
+       (font_style_to_value, font_style_symbolic): Adjusted for the
+       format change of font_style_table.
        (font_parse_family_registry): Don't overwrite existing foundry and
        family of font_spec.
        (font_score): Fix calculation of diff for sizes.
        (font_sort_entites): Call font_add_log.
        (font_delete_unmatched): Return a newly created list.
        (font_list_entities): Fix previous change.  Call font_add_log.
-       (font_matching_entity, font_open_entity, font_close_entity):
-       Call font_add_log.
+       (font_matching_entity, font_open_entity, font_close_entity): Call
+       font_add_log.
        (Ffont_xlfd_name): New arg FOLD-WILDCARDS.
        (Finternal_set_font_style_table): Delete.
        (BUILD_STYLE_TABLE): New macro.

diff --git a/src/font.c b/src/font.c
index 44c5aef9b90633affa71ab9f806bfdeaa09b4d2a..84f2a2ac867e334e6f334b48613c59c4ecb3e68c 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -500,13 +500,16 @@ font_prop_validate_style (style, val)
   if (INTEGERP (val))
     {
       n = XINT (val);
-      if ((n & 0xFF)
+      if (((n >> 4) & 0xF)
          >= ASIZE (AREF (font_style_table, prop - FONT_WEIGHT_INDEX)))
        val = Qerror;
       else
        {
-         Lisp_Object elt = AREF (AREF (font_style_table, prop - FONT_WEIGHT_INDEX), n & 0xFF);
-         if (XINT (XCDR (elt)) != (n >> 8))
+         Lisp_Object elt = AREF (AREF (font_style_table, prop - FONT_WEIGHT_INDEX), (n >> 4) & 0xF);
+
+         if ((n & 0xF) + 1 >= ASIZE (elt))
+           val = Qerror;
+         else if (XINT (AREF (elt, 0)) != (n >> 8))
            val = Qerror;
        }
     }