From 3e199297c6af86bc8dc7ee36076c9cd8dc28bb8b Mon Sep 17 00:00:00 2001
From: Kenichi Handa <handa@m17n.org>
Date: Thu, 8 Jun 2006 07:10:01 +0000
Subject: [PATCH] (main): Check -enable-font-backend arg after the check of
 -nl. (standard_args): Add "-enable-font-backend".

---
 src/emacs.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/emacs.c b/src/emacs.c
index 4bbbf84ebab..2bacb1abbed 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1181,13 +1181,6 @@ main (argc, argv
       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
@@ -1447,6 +1440,12 @@ main (argc, argv
   no_loadup
     = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
 
+#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 */
 
 #ifdef HAVE_X_WINDOWS
   /* Stupid kludge to catch command-line display spec.  We can't
@@ -1850,6 +1849,7 @@ struct standard_args standard_args[] =
   { "-unibyte", "--unibyte", 81, 0 },
   { "-no-multibyte", "--no-multibyte", 80, 0 },
   { "-nl", "--no-loadup", 70, 0 },
+  { "-enable-font-backend", "--enable-font-backend", 65, 0 },
   /* -d must come last before the options handled in startup.el.  */
   { "-d", "--display", 60, 1 },
   { "-display", 0, 60, 1 },
-- 
2.39.5