[Emacs-diffs] Changes to emacs/lisp/startup.el

[Eli Zaretskii]

Index: emacs/lisp/startup.el
diff -u emacs/lisp/startup.el:1.395 emacs/lisp/startup.el:1.396
--- emacs/lisp/startup.el:1.395 Thu Jan 12 02:27:00 2006
+++ emacs/lisp/startup.el       Sat Jan 21 09:32:13 2006
@@ -1628,7 +1628,7 @@
           (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 @@
                 ((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)))