diff options
| author | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
| commit | 2c302df3a13236bfbf8ea1b771d13618fcda8d71 (patch) | |
| tree | f26dc9f22861dc37610de319d05255de058c221b /src/font.h | |
| parent | 0c747cb143fa227e78f350ac353d703f489209df (diff) | |
| parent | 175069efeb080517afefdd44a06f7a779ea8c25c (diff) | |
| download | emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.tar.gz emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.zip | |
Merge from trunk
Diffstat (limited to 'src/font.h')
| -rw-r--r-- | src/font.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/font.h b/src/font.h index b2d7e49fa29..940eb3d001d 100644 --- a/src/font.h +++ b/src/font.h | |||
| @@ -823,8 +823,8 @@ extern void *font_get_frame_data (FRAME_PTR f, | |||
| 823 | 823 | ||
| 824 | extern void font_filter_properties (Lisp_Object font, | 824 | extern void font_filter_properties (Lisp_Object font, |
| 825 | Lisp_Object alist, | 825 | Lisp_Object alist, |
| 826 | const char *boolean_properties[], | 826 | const char *const boolean_properties[], |
| 827 | const char *non_boolean_properties[]); | 827 | const char *const non_boolean_properties[]); |
| 828 | 828 | ||
| 829 | #ifdef HAVE_FREETYPE | 829 | #ifdef HAVE_FREETYPE |
| 830 | extern struct font_driver ftfont_driver; | 830 | extern struct font_driver ftfont_driver; |