diff options
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 4c12ef5d3af..9707b6c1b71 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* ftfont.c -- FreeType font driver. | 1 | /* ftfont.c -- FreeType font driver. |
| 2 | Copyright (C) 2006-2014 Free Software Foundation, Inc. | 2 | Copyright (C) 2006-2015 Free Software Foundation, Inc. |
| 3 | Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 | 3 | Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 |
| 4 | National Institute of Advanced Industrial Science and Technology (AIST) | 4 | National Institute of Advanced Industrial Science and Technology (AIST) |
| 5 | Registration Number H13PRO009 | 5 | Registration Number H13PRO009 |
| @@ -38,12 +38,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 38 | #include "font.h" | 38 | #include "font.h" |
| 39 | #include "ftfont.h" | 39 | #include "ftfont.h" |
| 40 | 40 | ||
| 41 | /* Symbolic type of this font-driver. */ | ||
| 42 | static Lisp_Object Qfreetype; | ||
| 43 | |||
| 44 | /* Fontconfig's generic families and their aliases. */ | ||
| 45 | static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif; | ||
| 46 | |||
| 47 | /* Flag to tell if FcInit is already called or not. */ | 41 | /* Flag to tell if FcInit is already called or not. */ |
| 48 | static bool fc_initialized; | 42 | static bool fc_initialized; |
| 49 | 43 | ||
| @@ -2667,7 +2661,10 @@ ftfont_filter_properties (Lisp_Object font, Lisp_Object alist) | |||
| 2667 | void | 2661 | void |
| 2668 | syms_of_ftfont (void) | 2662 | syms_of_ftfont (void) |
| 2669 | { | 2663 | { |
| 2664 | /* Symbolic type of this font-driver. */ | ||
| 2670 | DEFSYM (Qfreetype, "freetype"); | 2665 | DEFSYM (Qfreetype, "freetype"); |
| 2666 | |||
| 2667 | /* Fontconfig's generic families and their aliases. */ | ||
| 2671 | DEFSYM (Qmonospace, "monospace"); | 2668 | DEFSYM (Qmonospace, "monospace"); |
| 2672 | DEFSYM (Qsans_serif, "sans-serif"); | 2669 | DEFSYM (Qsans_serif, "sans-serif"); |
| 2673 | DEFSYM (Qserif, "serif"); | 2670 | DEFSYM (Qserif, "serif"); |