procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't have desktop-save-mode query on `M-x kill-emacs'

Browse source 
* lisp/desktop.el (noninteractive): Prompting functions should not
be added to `kill-emacs-hook' (bug#28943).
(desktop-kill): Return t so that it can be used from
`kill-emacs-query-functions'.
This commit is contained in:
Lars Ingebrigtsen 2021-07-02 17:29:10 +02:00
parent 225ca617b7
commit 5bd04ea307
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/desktop.el
View file

@ -731,7 +731,7 @@ if different)."
;; ----------------------------------------------------------------------------
(unless noninteractive
(add-hook 'kill-emacs-hook #'desktop-kill))
(add-hook 'kill-emacs-query-functions #'desktop-kill))
(defun desktop-kill ()
"If `desktop-save-mode' is non-nil, do what `desktop-save' says to do.
@ -759,7 +759,8 @@ is nil, ask the user where to save the desktop."
(unless (yes-or-no-p "Error while saving the desktop. Ignore? ")
(signal (car err) (cdr err))))))
;; If we own it, we don't anymore.
(when (eq (emacs-pid) (desktop-owner)) (desktop-release-lock)))
(when (eq (emacs-pid) (desktop-owner)) (desktop-release-lock))
t)
;; ----------------------------------------------------------------------------
(defun desktop-list* (&rest args)