(command-line-1): Handle --no-desktop if desktop.el is not loaded.

2 files changed, 13 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8beecfd4a0..54af57feb0f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * startup.el (command-line-1): Handle --no-desktop if desktop.el
+        is not loaded.
+
 2006-01-20  Jay Belanger  <belanger@truman.edu>
 
         * calc/calcalg2.el (calc-sum-rec): Fix the sum when the lower
diff --git a/lisp/startup.el b/lisp/startup.el
index bc00dc36ba6..4db086fa7a7 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1628,7 +1628,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)))
@@ -1728,6 +1728,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)))