Mercurial > emacs

comparison lisp/desktop.el @ 108132:5e9162ac53b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
desktop.el (desktop-kill): ask-if-new: Ask if desktop file exists, but we aren't using it.
author Jan D. <jan.h.d@swipnet.se>
date Tue, 27 Apr 2010 08:45:43 +0200
parents c56cc351f300
children d418516def73
comparison
equal deleted inserted replaced
108131:aacd4ee6c3af 108132:5e9162ac53b2
618 If the desktop should be saved and `desktop-dirname' 618 If the desktop should be saved and `desktop-dirname'
619 is nil, ask the user where to save the desktop." 619 is nil, ask the user where to save the desktop."
620 (when (and desktop-save-mode 620 (when (and desktop-save-mode
621 (let ((exists (file-exists-p (desktop-full-file-name)))) 621 (let ((exists (file-exists-p (desktop-full-file-name))))
622 (or (eq desktop-save t) 622 (or (eq desktop-save t)
623 (and exists (memq desktop-save '(ask-if-new if-exists))) 623 (and exists (eq desktop-save 'if-exists))
624 ;; If it exists, but we aren't using it, we are going
625 ;; to ask for a new directory below.
626 (and exists desktop-dirname (eq desktop-save 'ask-if-new))
624 (and 627 (and
625 (or (memq desktop-save '(ask ask-if-new)) 628 (or (memq desktop-save '(ask ask-if-new))
626 (and exists (eq desktop-save 'ask-if-exists))) 629 (and exists (eq desktop-save 'ask-if-exists)))
627 (y-or-n-p "Save desktop? "))))) 630 (y-or-n-p "Save desktop? ")))))
628 (unless desktop-dirname 631 (unless desktop-dirname