aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-02-27 04:59:01 +0000
committerGlenn Morris2008-02-27 04:59:01 +0000
commit253ed25e06c08e75a3fec99f8cc849148f43ebc3 (patch)
treeea305522e8fe30de1f39c34f1ddbd2fbf266a318
parent4fe4d2859f29e71a651fb7d9ef80b835599ad0b2 (diff)
downloademacs-253ed25e06c08e75a3fec99f8cc849148f43ebc3.tar.gz
emacs-253ed25e06c08e75a3fec99f8cc849148f43ebc3.zip
(USAGE1): Add `--disable-font-backend'.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index edb62011614..9dd1358ac3f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-02-27 Glenn Morris <rgm@gnu.org>
2
3 * emacs.c (USAGE1): Add `--disable-font-backend'.
4
12008-02-27 Stefan Monnier <monnier@iro.umontreal.ca> 52008-02-27 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * fileio.c (Finsert_file_contents): Don't reset undo_list if no change 7 * fileio.c (Finsert_file_contents): Don't reset undo_list if no change
diff --git a/src/emacs.c b/src/emacs.c
index 6702b5e2846..6c589ce1050 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -263,6 +263,7 @@ Initialization options:\n\
263\n\ 263\n\
264--batch do not do interactive display; implies -q\n\ 264--batch do not do interactive display; implies -q\n\
265--debug-init enable Emacs Lisp debugger for init file\n\ 265--debug-init enable Emacs Lisp debugger for init file\n\
266--disable-font-backend do not use font backend (only if compiled)\n\
266--display, -d DISPLAY use X server DISPLAY\n\ 267--display, -d DISPLAY use X server DISPLAY\n\
267--multibyte, --no-unibyte inhibit the effect of EMACS_UNIBYTE\n\ 268--multibyte, --no-unibyte inhibit the effect of EMACS_UNIBYTE\n\
268--no-desktop do not load a saved desktop\n\ 269--no-desktop do not load a saved desktop\n\