diff options
| author | Joakim Verona | 2013-08-13 10:31:40 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 10:31:40 +0200 |
| commit | 8cd462fd025ea06895b9e4508c869b61d6be28d3 (patch) | |
| tree | 6faec45674f50844187625fe96977fff6b790f08 /src/font.h | |
| parent | c84d5d936dbda2084b2c08364c8c0d5e514fc1b6 (diff) | |
| parent | a45543bc75e845c9217130c65ddd00a81c18ffd1 (diff) | |
| download | emacs-8cd462fd025ea06895b9e4508c869b61d6be28d3.tar.gz emacs-8cd462fd025ea06895b9e4508c869b61d6be28d3.zip | |
merge from trunk
Diffstat (limited to 'src/font.h')
| -rw-r--r-- | src/font.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/font.h b/src/font.h index daeb320c1ab..adb4a582fd8 100644 --- a/src/font.h +++ b/src/font.h | |||
| @@ -760,6 +760,7 @@ extern Lisp_Object font_load_for_lface (struct frame *f, Lisp_Object *lface, | |||
| 760 | Lisp_Object spec); | 760 | Lisp_Object spec); |
| 761 | extern void font_prepare_for_face (struct frame *f, struct face *face); | 761 | extern void font_prepare_for_face (struct frame *f, struct face *face); |
| 762 | extern void font_done_for_face (struct frame *f, struct face *face); | 762 | extern void font_done_for_face (struct frame *f, struct face *face); |
| 763 | extern void clear_font_cache (struct frame *); | ||
| 763 | 764 | ||
| 764 | extern Lisp_Object font_open_by_spec (struct frame *f, Lisp_Object spec); | 765 | extern Lisp_Object font_open_by_spec (struct frame *f, Lisp_Object spec); |
| 765 | extern Lisp_Object font_open_by_name (struct frame *f, Lisp_Object name); | 766 | extern Lisp_Object font_open_by_name (struct frame *f, Lisp_Object name); |