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/ps-print.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/ps-print.el')
-rw-r--r-- | lisp/ps-print.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ps-print.el b/lisp/ps-print.el index 19431c30d68..b51eb944696 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -6645,7 +6645,8 @@ If FACE is not a valid face name, use default face." (error "Unprinted PostScript")))) (cond ((fboundp 'add-hook) - (funcall 'add-hook 'kill-emacs-hook 'ps-kill-emacs-check)) + (unless noninteractive + (funcall 'add-hook 'kill-emacs-hook 'ps-kill-emacs-check))) (kill-emacs-hook (message "Won't override existing `kill-emacs-hook'")) (t |