Merged from miles@gnu.org--gnu-2005 (patch 187, 704)

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--base-0
   tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704

 * emacs@sv.gnu.org/emacs--devo--0--patch-1
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-2
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-3
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-4
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-5
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-6
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-7
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-8
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-9
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-10
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-11
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-12
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-13
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-14
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-15
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-16
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-17
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-18
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-19
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-20
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-21
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-22
   Install ERC.

 * emacs@sv.gnu.org/emacs--devo--0--patch-23
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-24
   Fix ERC compiler warnings.

 * emacs@sv.gnu.org/emacs--devo--0--patch-25
   Use utf-8 encoding in ERC ChangeLogs.

 * emacs@sv.gnu.org/emacs--devo--0--patch-26
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-27
   Merge ERC-related Viper hacks into Viper.

 * emacs@sv.gnu.org/emacs--devo--0--patch-28
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-29
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-30
   Merge from erc--main--0

 * emacs@sv.gnu.org/gnus--rel--5.10--base-0
   tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-1
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-2
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-3
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-4
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-5
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-6
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-7
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-501

1 files changed, 14 insertions, 3 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index 432335ee9aa..a4197a85502 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -48,7 +48,9 @@ The value is nil if the selected frame is on a text-only-terminal.")
   :group 'internal)
 
 (defcustom inhibit-splash-screen nil
-  "*Non-nil inhibits the startup screen.
+  "Non-nil inhibits the startup screen.
+It also inhibits display of the initial message in the *scratch* buffer.
+
 This is for use in your personal init file, once you are familiar
 with the contents of the startup screen."
   :type 'boolean
@@ -1071,7 +1073,9 @@ opening the first frame (e.g. open a connection to an X server).")
 
 ")
   "Initial message displayed in *scratch* buffer at startup.
-If this is nil, no message will be displayed."
+If this is nil, no message will be displayed.
+If `inhibit-splash-screen' is non-nil, then no message is displayed,
+regardless of the value of this variable."
   :type '(choice (text :tag "Message")
 		 (const :tag "none" nil))
   :group 'initialization)
@@ -1630,7 +1634,7 @@ normal otherwise."
           (longopts
            (append '(("--funcall") ("--load") ("--insert") ("--kill")
                      ("--directory") ("--eval") ("--execute") ("--no-splash")
-                     ("--find-file") ("--visit") ("--file"))
+                     ("--find-file") ("--visit") ("--file") ("--no-desktop"))
                    (mapcar (lambda (elt)
                              (list (concat "-" (car elt))))
                            command-switch-alist)))
@@ -1730,6 +1734,13 @@ normal otherwise."
                 ((equal argi "-kill")
                  (kill-emacs t))
 
+		;; This is for when they use --no-desktop with -q, or
+		;; don't load Desktop in their .emacs.  If desktop.el
+		;; _is_ loaded, it will handle this switch, and we
+		;; won't see it by the time we get here.
+		((equal argi "-no-desktop")
+		 (message "\"--no-desktop\" ignored because the Desktop package is not loaded"))
+
                 ((string-match "^\\+[0-9]+\\'" argi)
                  (setq line (string-to-number argi)))