diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/emacs.c | 1 |
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 @@ | |||
| 1 | 2008-02-27 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs.c (USAGE1): Add `--disable-font-backend'. | ||
| 4 | |||
| 1 | 2008-02-27 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2008-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\ |