Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
but we aren't using it.
This commit is contained in:
Jan Djärv 2010-04-27 08:45:43 +02:00
parent 62fe59e783
commit 7dd7fbb975
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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

5
lisp/desktop.el
View file

@ -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)))