diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/fontset.h | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/fontset.h')
| -rw-r--r-- | src/fontset.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/fontset.h b/src/fontset.h index fe2e4fe0ca4..8831f4ce0b7 100644 --- a/src/fontset.h +++ b/src/fontset.h | |||
| @@ -32,7 +32,6 @@ extern void (*check_window_system_func) (void); | |||
| 32 | struct face; | 32 | struct face; |
| 33 | 33 | ||
| 34 | extern void free_face_fontset (FRAME_PTR, struct face *); | 34 | extern void free_face_fontset (FRAME_PTR, struct face *); |
| 35 | extern int face_suitable_for_char_p (struct face *, int); | ||
| 36 | extern int face_for_char (FRAME_PTR, struct face *, int, | 35 | extern int face_for_char (FRAME_PTR, struct face *, int, |
| 37 | int, Lisp_Object); | 36 | int, Lisp_Object); |
| 38 | extern Lisp_Object font_for_char (struct face *, int, int, Lisp_Object); | 37 | extern Lisp_Object font_for_char (struct face *, int, int, Lisp_Object); |
| @@ -51,4 +50,3 @@ struct font; | |||
| 51 | extern int face_for_font (struct frame *, Lisp_Object, struct face *); | 50 | extern int face_for_font (struct frame *, Lisp_Object, struct face *); |
| 52 | 51 | ||
| 53 | #endif /* EMACS_FONTSET_H */ | 52 | #endif /* EMACS_FONTSET_H */ |
| 54 | |||