From: Juri Linkov <juri@jurta.org>
Date: Sat, 29 Sep 2007 22:28:16 +0000 (+0000)
Subject: (standard_args): Change priority of "--no-splash"
X-Git-Tag: emacs-pretest-22.1.90~716
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bb378f19e2f7d941e96894f6e67368af77d90bde;p=emacs.git

(standard_args): Change priority of "--no-splash"
from 40 to 3.  Add "--no-desktop" with the same priority.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cbba8f5d3d5..0c79acd6b45 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-29  Juri Linkov  <juri@jurta.org>
+
+	* emacs.c (standard_args): Change priority of "--no-splash"
+	from 40 to 3.  Add "--no-desktop" with the same priority.
+
 2007-09-27  Jason Rumney  <jasonr@gnu.org>
 
 	* makefile.w32-in (LIBS): Add COMCTL32.
diff --git a/src/emacs.c b/src/emacs.c
index b356faa68ae..4910244fd81 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1813,7 +1813,6 @@ struct standard_args standard_args[] =
   { "-q", "--no-init-file", 50, 0 },
   { "-no-init-file", 0, 50, 0 },
   { "-no-site-file", "--no-site-file", 40, 0 },
-  { "-no-splash", "--no-splash", 40, 0 },
   { "-u", "--user", 30, 1 },
   { "-user", 0, 30, 1 },
   { "-debug-init", "--debug-init", 20, 0 },
@@ -1848,6 +1847,8 @@ struct standard_args standard_args[] =
   { "-hb", "--horizontal-scroll-bars", 5, 0 },
   { "-vb", "--vertical-scroll-bars", 5, 0 },
   { "-color", "--color", 5, 0},
+  { "-no-splash", "--no-splash", 3, 0 },
+  { "-no-desktop", "--no-desktop", 3, 0 },
   /* These have the same priority as ordinary file name args,
      so they are not reordered with respect to those.  */
   { "-L", "--directory", 0, 1 },