From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 7 Aug 2005 17:38:36 +0000 (+0000)
Subject: (endif): Convert -script into -scriptload.
X-Git-Tag: emacs-pretest-22.0.90~7757
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e09b9180d525e04497271f23cb7fc99fea21421e;p=emacs.git

(endif): Convert -script into -scriptload.
(standard_args): Add -scriptload.  Allow -basic-display with one dash.
---

diff --git a/src/emacs.c b/src/emacs.c
index 87aee828420..985a3eae96f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1153,9 +1153,9 @@ main (argc, argv
   if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args))
     {
       noninteractive = 1;	/* Set batch mode.  */
-      /* Convert --script to -l, un-skip it, and sort again so that -l will be
-	 handled in proper sequence.  */
-      argv[skip_args - 1] = "-l";
+      /* Convert --script to --scriptload, un-skip it, and sort again
+	 so that it will be handled in proper sequence.  */
+      argv[skip_args - 1] = "-scriptload";
       skip_args -= 2;
       sort_args (argc, argv);
     }
@@ -1834,7 +1834,7 @@ struct standard_args standard_args[] =
   { "-itype", 0, 15, 0 },
   { "-iconic", "--iconic", 15, 0 },
   { "-D", "--basic-display", 12, 0},
-  { "--basic-display", 0, 12, 0},
+  { "-basic-display", 0, 12, 0},
   { "-bg", "--background-color", 10, 1 },
   { "-background", 0, 10, 1 },
   { "-fg", "--foreground-color", 10, 1 },
@@ -1868,6 +1868,7 @@ struct standard_args standard_args[] =
   { "-directory", 0, 0, 1 },
   { "-l", "--load", 0, 1 },
   { "-load", 0, 0, 1 },
+  { "-scriptload", "--scriptload", 0, 1 },
   { "-f", "--funcall", 0, 1 },
   { "-funcall", 0, 0, 1 },
   { "-eval", "--eval", 0, 1 },