Mercurial > emacs
changeset 96414:37737408d4f2
(Finternal_char_font): Return font-object instead of font-name.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Sun, 29 Jun 2008 14:30:08 +0000 |
| parents | b38a7de9af46 |
| children | 9e8b96a59b97 |
| files | src/fontset.c |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fontset.c Sun Jun 29 14:27:16 2008 +0000 +++ b/src/fontset.c Sun Jun 29 14:30:08 2008 +0000 @@ -1645,11 +1645,11 @@ 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 @@ 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;