diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2011-03-06 01:30:16 +0100 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2011-03-06 01:30:16 +0100 |
| commit | 845fc5e555e73449596ba475060fd2674f3b51e9 (patch) | |
| tree | 5f039af84ae06b3378829c498190df480c75ac84 /lisp/desktop.el | |
| parent | d3877e8f063815efe92b3bced08f54f9c1644b74 (diff) | |
| download | emacs-845fc5e555e73449596ba475060fd2674f3b51e9.tar.gz | |
* lisp/bookmark.el:
* lisp/desktop.el:
* lisp/emacs-lock.el:
* lisp/ps-print.el:
* lisp/saveplace.el:
* lisp/net/tramp-cache.el:
* lisp/textmodes/reftex.el:
* lisp/org/org-id.el: Don't set `kill-emacs-hook' on noninteractive sessions.
Fixes: debbugs:8137
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 4ca4cec38ff..fd5baaf020f 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -611,7 +611,8 @@ Furthermore, it clears the variables listed in `desktop-globals-to-clear'." (delete-other-windows)) ;; ---------------------------------------------------------------------------- -(add-hook 'kill-emacs-hook 'desktop-kill) +(unless noninteractive + (add-hook 'kill-emacs-hook 'desktop-kill)) (defun desktop-kill () "If `desktop-save-mode' is non-nil, do what `desktop-save' says to do. |