[Emacs-diffs] Changes to emacs/src/emacs.c,v [emacs]

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         emacs
Changes by:     Kenichi Handa <handa>   06/06/06 03:50:58

Index: emacs.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/emacs.c,v
retrieving revision 1.328.4.31
retrieving revision 1.328.4.32
diff -u -b -r1.328.4.31 -r1.328.4.32
--- emacs.c     28 Mar 2006 23:08:10 -0000      1.328.4.31
+++ emacs.c     6 Jun 2006 03:50:58 -0000       1.328.4.32
@@ -821,6 +821,9 @@
   return count >= 3 ? REPORT_EMACS_BUG_PRETEST_ADDRESS : 
REPORT_EMACS_BUG_ADDRESS;
 }
 
+#ifdef USE_FONT_BACKEND
+extern int enable_font_backend;
+#endif /* USE_FONT_BACKEND */
 
 /* ARGSUSED */
 int
@@ -1178,6 +1181,13 @@
       exit (0);
     }
 
+#ifdef USE_FONT_BACKEND
+  enable_font_backend = 0;
+  if (argmatch (argv, argc, "-enable-font-backend", "--enable-font-backend",
+               4, NULL, &skip_args))
+    enable_font_backend = 1;
+#endif /* USE_FONT_BACKEND */
+
   if (! noninteractive)
     {
 #ifdef BSD_PGRPS
@@ -1624,6 +1634,9 @@
       syms_of_window ();
       syms_of_xdisp ();
 #ifdef HAVE_WINDOW_SYSTEM
+#ifdef USE_FONT_BACKEND
+      syms_of_font ();
+#endif /* USE_FONT_BACKEND */
       syms_of_fringe ();
       syms_of_image ();
 #endif /* HAVE_WINDOW_SYSTEM */