(Finternal_char_font): Return font-object instead of font-name.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5e26e44b61d7263eecfab5d8f0e1d5c0dd6b7a8e..4b3b75211bc82cdfe19ac5692a2e655141bd0d6a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-29  Kenichi Handa  <handa@m17n.org>
+
+       * fontset.c (Finternal_char_font): Return font-object instead of
+       font-name.
+
+       * composite.c (get_composition_id): Fix the width calculation for
+       TAB.
+
 2008-06-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * indent.c (Fvertical_motion): Properly handle float column arg.

diff --git a/src/fontset.c b/src/fontset.c
index 29a0bd4f1d11dddfc7d508edf0a99596be136e84..2809fdfb5eb6b75e8c5677c3a5e5bef9979e27c9 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1645,11 +1645,11 @@ fontset_from_font (font_object)
   return XINT (FONTSET_ID (fontset));
 }
 
-/* Return a cons (FONT-NAME . GLYPH-CODE).
-   FONT-NAME is the font name for the character at POSITION in the current
+/* Return a cons (FONT-OBJECT . GLYPH-CODE).
+   FONT-OBJECT is the font for the character at POSITION in the current
    buffer.  This is computed from all the text properties and overlays
    that apply to POSITION.  POSTION may be nil, in which case,
-   FONT-NAME is the font name for display the character CH with the
+   FONT-SPEC is the font for displaying the character CH with the
    default face.
 
    GLYPH-CODE is the glyph code in the font to use for the character.
@@ -1728,18 +1728,18 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0,
   face = FACE_FROM_ID (f, face_id);
   if (face->font)
     {
-      struct font *font = face->font;
-      unsigned code = font->driver->encode_char (font, c);
-      Lisp_Object fontname = font->props[FONT_NAME_INDEX];
+      unsigned code = face->font->driver->encode_char (face->font, c);
+      Lisp_Object font_object;
       /* Assignment to EMACS_INT stops GCC whining about limited range
         of data type.  */
       EMACS_INT cod = code;
 
       if (code == FONT_INVALID_CODE)
        return Qnil;
+      XSETFONT (font_object, face->font);
       if (cod <= MOST_POSITIVE_FIXNUM)
-       return Fcons (fontname, make_number (code));
-      return Fcons (fontname, Fcons (make_number (code >> 16),
+       return Fcons (font_object, make_number (code));
+      return Fcons (font_object, Fcons (make_number (code >> 16),
                                     make_number (code & 0xFFFF)));
     }
   return Qnil;