(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 8356d0ea04f49eab1443e11b03e2b01bac8d930e..97adc89995abe6c1d76417d47da7a1b356889643 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-24  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-23  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * alloc.c (gc_sweep): Check cons cell mark bits word by word

diff --git a/src/emacs.c b/src/emacs.c
index 55475e57799f81aeea488c28db4fd437c704b7eb..46d07b19936cb0e9d10ddf9e4d337fe19aca5414 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1822,7 +1822,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 },
@@ -1857,6 +1856,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 },