Mercurial > emacs
changeset 90804:5d649c564ce9
Change default value of `enable_font_backend' to 1
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-191
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 16 Apr 2007 02:49:06 +0000 |
| parents | ad785f2ac762 |
| children | 50209b69d25f |
| files | src/ChangeLog src/emacs.c |
| diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Apr 13 01:37:04 2007 +0000 +++ b/src/ChangeLog Mon Apr 16 02:49:06 2007 +0000 @@ -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
--- a/src/emacs.c Fri Apr 13 01:37:04 2007 +0000 +++ b/src/emacs.c Mon Apr 16 02:49:06 2007 +0000 @@ -1408,10 +1408,14 @@ = 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 @@ { "-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 },