From: Juanma Barranquero Date: Sun, 6 Mar 2011 00:30:16 +0000 (+0100) Subject: * lisp/bookmark.el: X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~674^2~16 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/845fc5e555e73449596ba475060fd2674f3b51e9 * 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 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 84fcf3a0cf..283e07b7a1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +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 diff --git a/lisp/bookmark.el b/lisp/bookmark.el index cd946e46be..d3db54c81d 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -2181,7 +2181,8 @@ This also runs `bookmark-exit-hook'." (bookmark-time-to-save-p t) (bookmark-save))) -(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." diff --git a/lisp/desktop.el b/lisp/desktop.el index 4ca4cec38f..fd5baaf020 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. diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el index 22795a47d9..6033648298 100644 --- a/lisp/emacs-lock.el +++ b/lisp/emacs-lock.el @@ -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) diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index a98e523a68..f8bc594e95 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -353,7 +353,8 @@ KEY identifies the connection, it is either a process or a vector." (write-region (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 diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el index 68d06ef34b..a59e787145 100644 --- a/lisp/obsolete/fast-lock.el +++ b/lisp/obsolete/fast-lock.el @@ -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)) ;;;###autoload (when (fboundp 'add-minor-mode) diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 5f0908e11c..54f2eaf233 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,7 @@ +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): diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el index 2f64b8b0bb..b979097dee 100644 --- a/lisp/org/org-id.el +++ b/lisp/org/org-id.el @@ -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." diff --git a/lisp/ps-print.el b/lisp/ps-print.el index 19431c30d6..b51eb94469 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 diff --git a/lisp/saveplace.el b/lisp/saveplace.el index b7d43bd230..c10b5cbb7e 100644 --- a/lisp/saveplace.el +++ b/lisp/saveplace.el @@ -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) diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index 6719a647c3..7e150bff99 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -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 reftex-extra-bindings-prefix reftex-extra-bindings-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 ------------------------------------------------------------------