Mercurial > emacs
changeset 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 | 8c71fed372cf |
| children | 6194dc57516d |
| files | src/emacs.c |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/emacs.c Thu Jun 08 07:08:36 2006 +0000 +++ b/src/emacs.c Thu Jun 08 07:10:01 2006 +0000 @@ -1181,13 +1181,6 @@ 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 @@ 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 @@ { "-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 },