diff options
| author | Glenn Morris | 2008-05-15 03:29:30 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-05-15 03:29:30 +0000 |
| commit | 6b33da9fcf8df12a009e461265fbd28c390b2be8 (patch) | |
| tree | 69946cdb2ceab6c623099a4521da8509bad9eda4 | |
| parent | b9b1cc1463ecd712077a63f83eb28cddfe85ac47 (diff) | |
| download | emacs-6b33da9fcf8df12a009e461265fbd28c390b2be8.tar.gz emacs-6b33da9fcf8df12a009e461265fbd28c390b2be8.zip | |
(USAGE1, standard_args): Remove -disable-font-backend.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/emacs.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 660e68bb865..10796d89ac7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-05-15 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs.c (USAGE1, standard_args): Remove -disable-font-backend. | ||
| 4 | |||
| 1 | 2008-05-15 Chong Yidong <cyd@stupidchicken.com> | 5 | 2008-05-15 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * fns.c (init_fns): Don't initialize weak_hash_tables here. | 7 | * fns.c (init_fns): Don't initialize weak_hash_tables here. |
diff --git a/src/emacs.c b/src/emacs.c index 43d783698f5..9fb5c4081f9 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -261,7 +261,6 @@ Initialization options:\n\ | |||
| 261 | \n\ | 261 | \n\ |
| 262 | --batch do not do interactive display; implies -q\n\ | 262 | --batch do not do interactive display; implies -q\n\ |
| 263 | --debug-init enable Emacs Lisp debugger for init file\n\ | 263 | --debug-init enable Emacs Lisp debugger for init file\n\ |
| 264 | --disable-font-backend do not use font backend (only if compiled)\n\ | ||
| 265 | --display, -d DISPLAY use X server DISPLAY\n\ | 264 | --display, -d DISPLAY use X server DISPLAY\n\ |
| 266 | --multibyte, --no-unibyte inhibit the effect of EMACS_UNIBYTE\n\ | 265 | --multibyte, --no-unibyte inhibit the effect of EMACS_UNIBYTE\n\ |
| 267 | --no-desktop do not load a saved desktop\n\ | 266 | --no-desktop do not load a saved desktop\n\ |
| @@ -1807,7 +1806,6 @@ struct standard_args standard_args[] = | |||
| 1807 | { "-unibyte", "--unibyte", 81, 0 }, | 1806 | { "-unibyte", "--unibyte", 81, 0 }, |
| 1808 | { "-no-multibyte", "--no-multibyte", 80, 0 }, | 1807 | { "-no-multibyte", "--no-multibyte", 80, 0 }, |
| 1809 | { "-nl", "--no-loadup", 70, 0 }, | 1808 | { "-nl", "--no-loadup", 70, 0 }, |
| 1810 | { "-disable-font-backend", "--disable-font-backend", 65, 0 }, | ||
| 1811 | /* -d must come last before the options handled in startup.el. */ | 1809 | /* -d must come last before the options handled in startup.el. */ |
| 1812 | { "-d", "--display", 60, 1 }, | 1810 | { "-d", "--display", 60, 1 }, |
| 1813 | { "-display", 0, 60, 1 }, | 1811 | { "-display", 0, 60, 1 }, |