diff options
| author | Eli Zaretskii | 2015-01-09 11:13:33 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-01-09 11:13:33 +0200 |
| commit | 70f298f88e84a5bfce26e3ff758157057a7948f3 (patch) | |
| tree | 4f21f700c9e0e60d633ce8993c835315d19bfe99 /src | |
| parent | 7c0bfa1d0803d824e3adaf9c6431997580771ef6 (diff) | |
| download | emacs-70f298f88e84a5bfce26e3ff758157057a7948f3.tar.gz emacs-70f298f88e84a5bfce26e3ff758157057a7948f3.zip | |
Fix the description of -nl in --help text. (Bug#19542)
src/emacs.c (usage_message): Fix the description of the -nl switch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/emacs.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 25f3264198d..49152c886f3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2015-01-09 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * emacs.c (usage_message): Fix the description of the -nl switch. | ||
| 4 | (Bug#19542) | ||
| 5 | |||
| 1 | 2015-01-08 Eli Zaretskii <eliz@gnu.org> | 6 | 2015-01-08 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * dispnew.c (buffer_posn_from_coords): Fix the value of the column | 8 | * dispnew.c (buffer_posn_from_coords): Fix the value of the column |
diff --git a/src/emacs.c b/src/emacs.c index d89a6810832..0b7adbd0967 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -233,7 +233,7 @@ Initialization options:\n\ | |||
| 233 | "\ | 233 | "\ |
| 234 | --no-desktop do not load a saved desktop\n\ | 234 | --no-desktop do not load a saved desktop\n\ |
| 235 | --no-init-file, -q load neither ~/.emacs nor default.el\n\ | 235 | --no-init-file, -q load neither ~/.emacs nor default.el\n\ |
| 236 | --no-shared-memory, -nl do not use shared memory\n\ | 236 | --no-loadup, -nl do not load loadup.el into bare Emacs\n\ |
| 237 | --no-site-file do not load site-start.el\n\ | 237 | --no-site-file do not load site-start.el\n\ |
| 238 | --no-site-lisp, -nsl do not add site-lisp directories to load-path\n\ | 238 | --no-site-lisp, -nsl do not add site-lisp directories to load-path\n\ |
| 239 | --no-splash do not display a splash screen on startup\n\ | 239 | --no-splash do not display a splash screen on startup\n\ |