[Emacs-diffs] /srv/bzr/emacs/trunk r100049: desktop.el (desktop-kill): ask-if-new: Ask if desktop file exists,

[Jan D.]

------------------------------------------------------------
revno: 100049
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2010-04-27 08:45:43 +0200
message:
  desktop.el (desktop-kill): ask-if-new: Ask if desktop file exists,
  but we aren't using it.
modified:
  lisp/ChangeLog
  lisp/desktop.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-25 07:23:01 +0000
+++ b/lisp/ChangeLog    2010-04-27 06:45:43 +0000
@@ -1,3 +1,8 @@
+2010-04-27  Jan Djärv  <address@hidden>
+
+       * desktop.el (desktop-kill): ask-if-new: Ask if desktop file exists,
+       but we aren't using it.
+
 2010-04-25  Jan Djärv  <address@hidden>
 
        * tool-bar.el (tool-bar-local-item-from-menu): Revert unintended

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2010-03-25 06:18:17 +0000
+++ b/lisp/desktop.el   2010-04-27 06:45:43 +0000
@@ -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)))