[Emacs-diffs] Changes to emacs/src/emacs.c,v [EMACS_22_BASE]

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Juri Linkov <jurta>     07/09/29 22:27:54

Index: emacs.c
===================================================================
RCS file: /sources/emacs/emacs/src/emacs.c,v
retrieving revision 1.401.2.2
retrieving revision 1.401.2.3
diff -u -b -r1.401.2.2 -r1.401.2.3
--- emacs.c     7 Aug 2007 08:57:06 -0000       1.401.2.2
+++ emacs.c     29 Sep 2007 22:27:53 -0000      1.401.2.3
@@ -1813,7 +1813,6 @@
   { "-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 @@
   { "-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 },