comparison src/emacs.c @ 90435:8dea9daf4355

(main): Check -enable-font-backend arg after the check of -nl. (standard_args): Add "-enable-font-backend".
author Kenichi Handa <handa@m17n.org>
date Thu, 08 Jun 2006 07:10:01 +0000
parents a8190f7e546e
children a1a25ac6c88a
comparison
equal deleted inserted replaced
90434:8c71fed372cf 90435:8dea9daf4355
1179 printf (USAGE3); 1179 printf (USAGE3);
1180 printf (USAGE4, bug_reporting_address ()); 1180 printf (USAGE4, bug_reporting_address ());
1181 exit (0); 1181 exit (0);
1182 } 1182 }
1183 1183
1184 #ifdef USE_FONT_BACKEND
1185 enable_font_backend = 0;
1186 if (argmatch (argv, argc, "-enable-font-backend", "--enable-font-backend",
1187 4, NULL, &skip_args))
1188 enable_font_backend = 1;
1189 #endif /* USE_FONT_BACKEND */
1190
1191 if (! noninteractive) 1184 if (! noninteractive)
1192 { 1185 {
1193 #ifdef BSD_PGRPS 1186 #ifdef BSD_PGRPS
1194 if (initialized) 1187 if (initialized)
1195 { 1188 {
1445 } 1438 }
1446 1439
1447 no_loadup 1440 no_loadup
1448 = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args); 1441 = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
1449 1442
1443 #ifdef USE_FONT_BACKEND
1444 enable_font_backend = 0;
1445 if (argmatch (argv, argc, "-enable-font-backend", "--enable-font-backend",
1446 4, NULL, &skip_args))
1447 enable_font_backend = 1;
1448 #endif /* USE_FONT_BACKEND */
1450 1449
1451 #ifdef HAVE_X_WINDOWS 1450 #ifdef HAVE_X_WINDOWS
1452 /* Stupid kludge to catch command-line display spec. We can't 1451 /* Stupid kludge to catch command-line display spec. We can't
1453 handle this argument entirely in window system dependent code 1452 handle this argument entirely in window system dependent code
1454 because we don't even know which window system dependent code 1453 because we don't even know which window system dependent code
1848 { "-no-unibyte", "--no-unibyte", 83, 0 }, 1847 { "-no-unibyte", "--no-unibyte", 83, 0 },
1849 { "-multibyte", "--multibyte", 82, 0 }, 1848 { "-multibyte", "--multibyte", 82, 0 },
1850 { "-unibyte", "--unibyte", 81, 0 }, 1849 { "-unibyte", "--unibyte", 81, 0 },
1851 { "-no-multibyte", "--no-multibyte", 80, 0 }, 1850 { "-no-multibyte", "--no-multibyte", 80, 0 },
1852 { "-nl", "--no-loadup", 70, 0 }, 1851 { "-nl", "--no-loadup", 70, 0 },
1852 { "-enable-font-backend", "--enable-font-backend", 65, 0 },
1853 /* -d must come last before the options handled in startup.el. */ 1853 /* -d must come last before the options handled in startup.el. */
1854 { "-d", "--display", 60, 1 }, 1854 { "-d", "--display", 60, 1 },
1855 { "-display", 0, 60, 1 }, 1855 { "-display", 0, 60, 1 },
1856 /* Now for the options handled in startup.el. */ 1856 /* Now for the options handled in startup.el. */
1857 { "-Q", "--quick", 55, 0 }, 1857 { "-Q", "--quick", 55, 0 },