Change default value of `enable_font_backend' to 1

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-191

2 files changed, 12 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 61e6de2c97d..18d5e40c240 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-16  Miles Bader  <miles@gnu.org>
+
+        * emacs.c (main): Change default value of `enable_font_backend' to 1.
+        Parse "--disable-font-backend" option.
+        (standard_args): Add "--disable-font-backend" option.
+
 2007-04-10  Chong Yidong  <cyd@stupidchicken.com>
 
         * xdisp.c (note_mode_line_or_margin_highlight): Don't decrement
diff --git a/src/emacs.c b/src/emacs.c
index aec551b5268..8336981e66c 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1408,10 +1408,14 @@ main (argc, argv
     = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
 
 #ifdef USE_FONT_BACKEND
-  enable_font_backend = 0;
+  enable_font_backend = 1;
   if (argmatch (argv, argc, "-enable-font-backend", "--enable-font-backend",
                 4, NULL, &skip_args))
     enable_font_backend = 1;
+  else if (argmatch (argv, argc,
+                     "-disable-font-backend", "--disable-font-backend",
+                     4, NULL, &skip_args))
+    enable_font_backend = 0;
 #endif  /* USE_FONT_BACKEND */
 
 #ifdef HAVE_X_WINDOWS
@@ -1818,6 +1822,7 @@ struct standard_args standard_args[] =
   { "-no-multibyte", "--no-multibyte", 80, 0 },
   { "-nl", "--no-loadup", 70, 0 },
   { "-enable-font-backend", "--enable-font-backend", 65, 0 },
+  { "-disable-font-backend", "--disable-font-backend", 65, 0 },
   /* -d must come last before the options handled in startup.el.  */
   { "-d", "--display", 60, 1 },
   { "-display", 0, 60, 1 },