*** /home/lh/cvsroot/emacs/lisp/desktop.el.~1.97.~	2006-01-23 08:13:25.000000000 +0100
--- /home/lh/cvsroot/emacs/lisp/desktop.el	2006-01-23 08:28:12.766853621 +0100
***************
*** 1156,1161 ****
--- 1156,1162 ----
  ;; after finishing loading the init file.
  ;; We cannot use `command-switch-alist' to process "--no-desktop" because these
  ;; functions are processed after `after-init-hook'.
+ ;;;###autoload
  (add-hook
    'after-init-hook
    '(lambda ()
*** /home/lh/cvsroot/emacs/lisp/startup.el.orig	2006-01-23 08:13:25.714942861 +0100
--- /home/lh/cvsroot/emacs/lisp/startup.el	2006-01-23 08:23:20.391560955 +0100
***************
*** 1632,1638 ****
            (longopts
             (append '(("--funcall") ("--load") ("--insert") ("--kill")
                       ("--directory") ("--eval") ("--execute") ("--no-splash")
!                      ("--find-file") ("--visit") ("--file") ("--no-desktop"))
                     (mapcar (lambda (elt)
                               (list (concat "-" (car elt))))
                             command-switch-alist)))
--- 1632,1638 ----
            (longopts
             (append '(("--funcall") ("--load") ("--insert") ("--kill")
                       ("--directory") ("--eval") ("--execute") ("--no-splash")
!                      ("--find-file") ("--visit") ("--file"))
                     (mapcar (lambda (elt)
                               (list (concat "-" (car elt))))
                             command-switch-alist)))
***************
*** 1732,1744 ****
                  ((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)))
  
--- 1732,1737 ----