Mercurial > emacs
changeset 88902:8975795eb087
(get_font_repertory_func): New prototype.
(make_fontset_for_ascii_face, fs_load_font): Prototypes fixed.
(FS_LOAD_FONT): Call fs_load_font with the 3rd arg charset_ascii.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 26 Jul 2002 04:06:05 +0000 |
| parents | bcf253c370e8 |
| children | d32a3736c4fe |
| files | src/fontset.h |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fontset.h Fri Jul 26 04:05:48 2002 +0000 +++ b/src/fontset.h Fri Jul 26 04:06:05 2002 +0000 @@ -182,6 +182,9 @@ This function set the memer `encoder' of the structure. */ extern void (*find_ccl_program_func) P_ ((struct font_info *)); +extern Lisp_Object (*get_font_repertory_func) P_ ((struct frame *, + struct font_info *)); + /* Check if any window system is used now. */ extern void (*check_window_system_func) P_ ((void)); @@ -191,8 +194,8 @@ extern Lisp_Object fontset_font_pattern P_ ((FRAME_PTR, struct face *, int)); extern int face_suitable_for_char_p P_ ((struct face *, int)); extern int face_for_char P_ ((FRAME_PTR, struct face *, int)); -extern int make_fontset_for_ascii_face P_ ((FRAME_PTR, int)); -extern struct font_info *fs_load_font P_ ((struct frame *, char *)); +extern int make_fontset_for_ascii_face P_ ((FRAME_PTR, int, struct face *)); +extern struct font_info *fs_load_font P_ ((struct frame *, char *, int)); extern int fs_query_fontset P_ ((Lisp_Object, int)); EXFUN (Fquery_fontset, 2); extern Lisp_Object list_fontsets P_ ((struct frame *, Lisp_Object, int)); @@ -209,7 +212,7 @@ struct font_info of the loaded font. If loading fails, return NULL. */ -#define FS_LOAD_FONT(f, fontname) fs_load_font (f, fontname) +#define FS_LOAD_FONT(f, fontname) fs_load_font (f, fontname, charset_ascii) /* Return an immutable id for font_info FONT_INFO on frame F. The