Commit 845fc5e5 authored by Juanma Barranquero's avatar Juanma Barranquero

* 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
parent d3877e8f
2011-03-06 Juanma Barranquero <>
* bookmark.el:
* desktop.el:
* emacs-lock.el:
* ps-print.el:
* saveplace.el:
* net/tramp-cache.el:
* textmodes/reftex.el:
Don't set `kill-emacs-hook' on noninteractive sessions (bug#8137).
2011-03-05 Antoine Levitt <>
* files.el (delete-directory, copy-directory, list-directory): Use
......@@ -2181,7 +2181,8 @@ This also runs `bookmark-exit-hook'."
(bookmark-time-to-save-p t)
(add-hook 'kill-emacs-hook 'bookmark-exit-hook-internal)
(unless noninteractive
(add-hook 'kill-emacs-hook 'bookmark-exit-hook-internal))
(defun bookmark-unload-function ()
"Unload the Bookmark library."
......@@ -611,7 +611,8 @@ Furthermore, it clears the variables listed in `desktop-globals-to-clear'."
;; ----------------------------------------------------------------------------
(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.
......@@ -88,7 +88,8 @@ If the buffer is locked, signal error and display its name."
(if emacs-lock-buffer-locked
(setq emacs-lock-from-exiting t)))
(add-hook 'kill-emacs-hook 'check-emacs-lock)
(unless noninteractive
(add-hook 'kill-emacs-hook 'check-emacs-lock))
(add-hook 'kill-buffer-hook 'emacs-lock-check-buffer-lock)
(add-hook 'shell-mode-hook 'emacs-lock-was-buffer-locked)
(add-hook 'shell-mode-hook 'emacs-lock-shell-sentinel)
......@@ -353,7 +353,8 @@ KEY identifies the connection, it is either a process or a vector."
(point-min) (point-max) tramp-persistency-file-name))))))
(add-hook 'kill-emacs-hook 'tramp-dump-connection-properties)
(unless noninteractive
(add-hook 'kill-emacs-hook 'tramp-dump-connection-properties))
(add-hook 'tramp-cache-unload-hook
'(lambda ()
(remove-hook 'kill-emacs-hook
......@@ -840,7 +840,8 @@ See `fast-lock-get-face-properties'."
(add-hook 'after-save-hook 'fast-lock-save-cache-after-save-file)
(add-hook 'kill-buffer-hook 'fast-lock-save-cache-before-kill-buffer)
(add-hook 'kill-emacs-hook 'fast-lock-save-caches-before-kill-emacs)
(unless noninteractive
(add-hook 'kill-emacs-hook 'fast-lock-save-caches-before-kill-emacs))
(when (fboundp 'add-minor-mode)
2011-03-06 Juanma Barranquero <>
* org-id.el: Don't set `kill-emacs-hook' on noninteractive sessions.
2011-02-10 Stefan Monnier <>
* org-remember.el (org-remember-mode-map):
......@@ -519,7 +519,8 @@ When CHECK is given, prepare detailed information about duplicate IDs."
(puthash id (abbreviate-file-name file) org-id-locations)
(add-to-list 'org-id-files (abbreviate-file-name file))))
(add-hook 'kill-emacs-hook 'org-id-locations-save)
(unless noninteractive
(add-hook 'kill-emacs-hook 'org-id-locations-save))
(defun org-id-hash-to-alist (hash)
"Turn an org-id hash into an alist, so that it can be written to a file."
......@@ -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)))
(message "Won't override existing `kill-emacs-hook'"))
......@@ -300,7 +300,8 @@ may have changed\) back to `save-place-alist'."
(add-hook 'find-file-hook 'save-place-find-file-hook t)
(add-hook 'kill-emacs-hook 'save-place-kill-emacs-hook)
(unless noninteractive
(add-hook 'kill-emacs-hook 'save-place-kill-emacs-hook))
(add-hook 'kill-buffer-hook 'save-place-to-alist)
......@@ -567,7 +567,7 @@ on the menu bar.
"Save RefTeX's parse file for this buffer if the information has changed."
;; Save the parsing information if it was modified.
;; This function should be installed in `kill-buffer-hook'.
;; We are careful to make sure nothing goes wring in this function.
;; We are careful to make sure nothing goes wrong in this function.
(when (and (boundp 'reftex-mode) reftex-mode
(boundp 'reftex-save-parse-info) reftex-save-parse-info
(boundp 'reftex-docstruct-symbol) reftex-docstruct-symbol
......@@ -2397,7 +2397,7 @@ IGNORE-WORDS List of words which should be removed from the string."
(define-key reftex-mode-map
;;; =========================================================================
......@@ -2568,7 +2568,8 @@ With optional NODE, go directly to that node."
;;; Install the kill-buffer and kill-emacs hooks ------------------------------
(add-hook 'kill-buffer-hook 'reftex-kill-buffer-hook)
(add-hook 'kill-emacs-hook 'reftex-kill-emacs-hook)
(unless noninteractive
(add-hook 'kill-emacs-hook 'reftex-kill-emacs-hook))
;;; Run Hook ------------------------------------------------------------------
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment