[Emacs-diffs] emacs-24 70f298f: Fix the description of -nl in --help text. (Bug#19542)

[Eli Zaretskii]

branch: emacs-24
commit 70f298f88e84a5bfce26e3ff758157057a7948f3
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix the description of -nl in --help text.  (Bug#19542)
    
     src/emacs.c (usage_message): Fix the description of the -nl switch.
---
 src/ChangeLog |    5 +++++
 src/emacs.c   |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 25f3264..49152c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-09  Eli Zaretskii  <address@hidden>
+
+       * emacs.c (usage_message): Fix the description of the -nl switch.
+       (Bug#19542)
+
 2015-01-08  Eli Zaretskii  <address@hidden>
 
        * dispnew.c (buffer_posn_from_coords): Fix the value of the column
diff --git a/src/emacs.c b/src/emacs.c
index d89a681..0b7adbd 100644
--- 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\