Fix the description of -nl in --help text. (Bug#19542)

 src/emacs.c (usage_message): Fix the description of the -nl switch.

diff --git a/src/ChangeLog b/src/ChangeLog
index 25f3264198dd3ea2c8904590316cc71fe6f7d52d..49152c886f3a505432b2c0c2c76da55d8dea50b6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-09  Eli Zaretskii  <eliz@gnu.org>
+
+       * emacs.c (usage_message): Fix the description of the -nl switch.
+       (Bug#19542)
+
 2015-01-08  Eli Zaretskii  <eliz@gnu.org>
 
        * dispnew.c (buffer_posn_from_coords): Fix the value of the column

diff --git a/src/emacs.c b/src/emacs.c
index d89a681083223802c68b623313c696c1439be783..0b7adbd0967aa2fcf88b8658de2c6db36c888295 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -233,7 +233,7 @@ Initialization options:\n\
     "\
 --no-desktop                do not load a saved desktop\n\
 --no-init-file, -q          load neither ~/.emacs nor default.el\n\
---no-shared-memory, -nl     do not use shared memory\n\
+--no-loadup, -nl            do not load loadup.el into bare Emacs\n\
 --no-site-file              do not load site-start.el\n\
 --no-site-lisp, -nsl        do not add site-lisp directories to load-path\n\
 --no-splash                 do not display a splash screen on startup\n\