diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 16:32:27 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 16:32:27 +0200 |
| commit | 220d91b834f7f7252b9953460422151b86b3520c (patch) | |
| tree | 8f3e16983e83ac0da6beef346cb05cd2591a7f83 /src/font.h | |
| parent | 31e96eecc09283b5169faf0d5dc1c8efd58539ac (diff) | |
| parent | 9d4f32e88a1b642070f0adb41df04a0846c31970 (diff) | |
| download | emacs-220d91b834f7f7252b9953460422151b86b3520c.tar.gz | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/font.h')
| -rw-r--r-- | src/font.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/font.h b/src/font.h index c322b8e590f..b2d7e49fa29 100644 --- a/src/font.h +++ b/src/font.h @@ -581,7 +581,7 @@ struct font_driver FONT-ENTITY and it must be opened to check it, return -1. */ int (*has_char) (Lisp_Object font, int c); - /* Return a glyph code of FONT for characer C (Unicode code point). + /* Return a glyph code of FONT for character C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. */ unsigned (*encode_char) (struct font *font, int c); @@ -821,6 +821,11 @@ extern int font_put_frame_data (FRAME_PTR f, extern void *font_get_frame_data (FRAME_PTR f, struct font_driver *driver); +extern void font_filter_properties (Lisp_Object font, + Lisp_Object alist, + const char *boolean_properties[], + const char *non_boolean_properties[]); + #ifdef HAVE_FREETYPE extern struct font_driver ftfont_driver; extern void syms_of_ftfont (void); |