Commit 7dd7fbb9 authored by Jan Djärv's avatar Jan Djärv

desktop.el (desktop-kill): ask-if-new: Ask if desktop file exists,

but we aren't using it.
parent 62fe59e7
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
......
......@@ -620,7 +620,10 @@ is nil, ask the user where to save the desktop."
(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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment