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

[Lars Hansen]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.82 emacs/lisp/desktop.el:1.83
*** emacs/lisp/desktop.el:1.82  Sun Apr  3 14:01:43 2005
--- emacs/lisp/desktop.el       Mon Apr 18 18:27:39 2005
***************
*** 1030,1038 ****
    'after-init-hook
    '(lambda ()
      (let ((key "--no-desktop"))
!       (if (member key command-line-args)
!         (delete key command-line-args)
!         (when desktop-save-mode (desktop-read))))))
  
  (provide 'desktop)
  
--- 1030,1039 ----
    'after-init-hook
    '(lambda ()
      (let ((key "--no-desktop"))
!       (when (member key command-line-args)
!         (setq command-line-args (delete key command-line-args))
!         (setq desktop-save-mode nil)))
!     (when desktop-save-mode (desktop-read))))
  
  (provide 'desktop)