(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 cbba8f5d3d5c00df084f635a3746b9d68e8b992d..0c79acd6b45da90ec4a55e743b91f4e048c97099 100644 (file)
--- 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 b356faa68ae111798e4b92c63dd09c7be2fd0f9e..4910244fd81e54c2d14015257b52df84650d330f 100644 (file)
--- 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 },