# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1272350743 -7200
# Node ID 5e9162ac53b2323d9b37abf0c935c4ccaf6fb967
# Parent  aacd4ee6c3afd9132a23d16e41d959cf74e49940
desktop.el (desktop-kill): ask-if-new: Ask if desktop file exists,
but we aren't using it.

diff -r aacd4ee6c3af -r 5e9162ac53b2 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Apr 27 06:40:58 2010 +0000
+++ b/lisp/ChangeLog	Tue Apr 27 08:45:43 2010 +0200
@@ -1,3 +1,8 @@
+2010-04-27  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* desktop.el (desktop-kill): ask-if-new: Ask if desktop file exists,
+	but we aren't using it.
+
 2010-04-25  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* tool-bar.el (tool-bar-local-item-from-menu): Revert unintended
diff -r aacd4ee6c3af -r 5e9162ac53b2 lisp/desktop.el
--- a/lisp/desktop.el	Tue Apr 27 06:40:58 2010 +0000
+++ b/lisp/desktop.el	Tue Apr 27 08:45:43 2010 +0200
@@ -620,7 +620,10 @@
   (when (and desktop-save-mode
              (let ((exists (file-exists-p (desktop-full-file-name))))
                (or (eq desktop-save t)
-                   (and exists (memq desktop-save '(ask-if-new if-exists)))
+                   (and exists (eq desktop-save 'if-exists))
+		   ;; If it exists, but we aren't using it, we are going
+		   ;; to ask for a new directory below.
+                   (and exists desktop-dirname (eq desktop-save 'ask-if-new))
                    (and
                     (or (memq desktop-save '(ask ask-if-new))
                         (and exists (eq desktop-save 'ask-if-exists)))