diff options
| author | Kenichi Handa <handa@m17n.org> | 2002-07-26 04:06:05 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2002-07-26 04:06:05 +0000 |
| commit | 153b4d7b751e341512229cfd529751b197f4ab77 (patch) | |
| tree | 5b824af677e050b63af38aea2db871b3926ebb6d /src/fontset.h | |
| parent | da78062bf9c1a1b4e737ead21c73bfb63047cd64 (diff) | |
| download | emacs-153b4d7b751e341512229cfd529751b197f4ab77.tar.gz | |
(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.
Diffstat (limited to 'src/fontset.h')
| -rw-r--r-- | src/fontset.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/fontset.h b/src/fontset.h index 524a92c274d..899f83b44e5 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -182,6 +182,9 @@ extern void (*set_frame_fontset_func) P_ ((struct frame *f, Lisp_Object arg, 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 void free_face_fontset P_ ((FRAME_PTR, struct face *)); 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 @@ extern Lisp_Object Vvertical_centering_font_regexp; 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 |