Don't say Fnext_read_file_uses_dialog_p is const

[gnu-emacs] / src / ftfont.c

diff --git a/src/ftfont.c b/src/ftfont.c
index 4c12ef5d3afe0e467e39e552e33b7df269737cc2..9707b6c1b71214f9c63c2aff4a9a3f8bd287c0fe 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1,5 +1,5 @@
 /* ftfont.c -- FreeType font driver.
 /* ftfont.c -- FreeType font driver.

-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2015 Free Software Foundation, Inc.

    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009


@@ -38,12 +38,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "font.h"
 #include "ftfont.h"
 
 #include "font.h"
 #include "ftfont.h"
 

-/* Symbolic type of this font-driver.  */
-static Lisp_Object Qfreetype;
-
-/* Fontconfig's generic families and their aliases.  */
-static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif;
-

 /* Flag to tell if FcInit is already called or not.  */
 static bool fc_initialized;
 
 /* Flag to tell if FcInit is already called or not.  */
 static bool fc_initialized;
 


@@ -2667,7 +2661,10 @@ ftfont_filter_properties (Lisp_Object font, Lisp_Object alist)
 void
 syms_of_ftfont (void)
 {
 void
 syms_of_ftfont (void)
 {

+  /* Symbolic type of this font-driver.  */

   DEFSYM (Qfreetype, "freetype");
   DEFSYM (Qfreetype, "freetype");

+
+  /* Fontconfig's generic families and their aliases.  */

   DEFSYM (Qmonospace, "monospace");
   DEFSYM (Qsans_serif, "sans-serif");
   DEFSYM (Qserif, "serif");
   DEFSYM (Qmonospace, "monospace");
   DEFSYM (Qsans_serif, "sans-serif");
   DEFSYM (Qserif, "serif");