Make "--no-desktop" turn off `desktop-save-mode'.

diff --git a/lisp/desktop.el b/lisp/desktop.el
index ed663d375d54fc4bbd56851942b9fa12f8190dbf..8e81e8826fefcf435ac89984a634137dc5ac2f18 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1030,9 +1030,10 @@ If there are no buffers left to create, kill the timer."
   '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)