# HG changeset patch # User Lars Hansen # Date 1113848859 0 # Node ID ef63bf685348203fab3cbaad6d1c8e326b3eb111 # Parent 54eea2db977341801c516849236781abbe625fb5 Make "--no-desktop" turn off `desktop-save-mode'. diff -r 54eea2db9773 -r ef63bf685348 lisp/desktop.el --- a/lisp/desktop.el Mon Apr 18 14:10:09 2005 +0000 +++ b/lisp/desktop.el Mon Apr 18 18:27:39 2005 +0000 @@ -1030,9 +1030,10 @@ '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)))))) + (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)