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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8beecfd4a0b215f8c868b15aa0b8c4e3e23f80a..54af57feb0fbd6285edb6f6e8ea261a3487de7f1 100644 (file)
--- 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 bc00dc36ba63b397fbadb70a9c5dad9d577a6100..4db086fa7a73b7de435cfc79a868aa82f12f877f 100644 (file)
--- 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)))