master 5bd04ea: Don't have desktop-save-mode query on `M-x kill-emacs'

[Lars Ingebrigtsen]

branch: master
commit 5bd04ea307f1dfc5002715a23b8bea1c038f65a6
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Don't have desktop-save-mode query on `M-x kill-emacs'
    
    * 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'.
---
 lisp/desktop.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/desktop.el b/lisp/desktop.el
index fb7c6c7..ae8d026 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -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)