From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 12 Jun 1998 23:20:54 +0000 (+0000)
Subject: (standard_args): Fix arg order to match code in `main'.
X-Git-Tag: emacs-20.3~624
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=05922407741cef79ef8a0f77e15fb8b3d18c2634;p=emacs.git

(standard_args): Fix arg order to match code in `main'.
---

diff --git a/src/emacs.c b/src/emacs.c
index f24e7bd6dcb..3a1e0f2b5ff 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1299,21 +1299,27 @@ struct standard_args
 
 struct standard_args standard_args[] =
 {
-  { "-version", "--version", 110, 0 },
-  { "-help", "--help", 110, 0 },
-  { "-nl", "--no-shared-memory", 100, 0 },
+  { "-version", "--version", 150, 0 },
+#ifdef HAVE_SHM
+  { "-nl", "--no-shared-memory", 140, 0 },
+#endif
 #ifdef VMS
-  { "-map", "--map-data", 100, 0 },
+  { "-map", "--map-data", 130, 0 },
 #endif
-  { "-t", "--terminal", 90, 1 },
+  { "-t", "--terminal", 120, 1 },
+  { "-nw", "--no-windows", 110, 0 },
+  { "-batch", "--batch", 100, 0 },
+  { "-help", "--help", 90, 0 },
   { "-d", "--display", 80, 1 },
   { "-display", 0, 80, 1 },
-  { "-nw", "--no-windows", 70, 0 },
-  { "-no-unibyte", "--no-unibyte", 66, 0 },
-  { "-multibyte", "--multibyte", 66, 0 },
-  { "-unibyte", "--unibyte", 65, 0 },
-  { "-no-multibyte", "--no-multibyte", 65, 0 },
-  { "-batch", "--batch", 60, 0 },
+  { "-no-unibyte", "--no-unibyte", 71, 0 },
+  { "-multibyte", "--multibyte", 71, 0 },
+  { "-unibyte", "--unibyte", 70, 0 },
+  { "-no-multibyte", "--no-multibyte", 70, 0 },
+#ifdef CANNOT_DUMP
+  { "-nl", "--no-loadup", 60, 0 },
+#endif
+  /* Now for the options handled in startup.el.  */
   { "-q", "--no-init-file", 50, 0 },
   { "-no-init-file", 0, 50, 0 },
   { "-no-site-file", "--no-site-file", 40, 0 },