(Ffont_get): Return a symbol for :weight, :slant, and :width.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3ccbdc8743920e1d231ab6d111d3e796d778e44a..16e21ac3339b3e7e7805e6b0ce337eca89080176 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -16,6 +16,7 @@
        font-object to nil.
        (font_close_object): Don't check FONT_CLOSE_OBJECT.
        (font_at): Don't call font_check_object.
+       (Ffont_get): Return a symbol for :weight, :slant, and :width.
 
 2008-06-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 

diff --git a/src/font.c b/src/font.c
index 4d2f486181f14b50a756e8b3c38999642b02f02d..6ccef312d7a836b6ea4b15e726593425b7a8655a 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -3627,7 +3627,11 @@ encoding of a font, e.g. ``iso8859-1''.
 VALUE must be a non-negative integer or a floating point number
 specifying the font size.  It specifies the font size in pixels
 (if VALUE is an integer), or in points (if VALUE is a float).
-usage: (font-spec ARGS ...)  */)
+usage: (font-spec ARGS ...)
+
+`:name'
+
+VALUE must be a string of XLFD-style or fontconfig-style font name.  */)
      (nargs, args)
      int nargs;
      Lisp_Object *args;
@@ -3728,6 +3732,8 @@ FONT is a font-spec, a font-entity, or a font-object.  */)
   CHECK_SYMBOL (key);
 
   idx = get_font_prop_index (key);
+  if (idx >= FONT_WEIGHT_INDEX && idx <= FONT_WIDTH_INDEX)
+    return font_style_symbolic (font, idx, 0);
   if (idx >= 0 && idx < FONT_EXTRA_INDEX)
     return AREF (font, idx);
   return Fcdr (Fassq (key, AREF (font, FONT_EXTRA_INDEX)));