[Emacs-diffs] /srv/bzr/emacs/trunk r103541: * lisp/bookmark.el:

[Juanma Barranquero]

------------------------------------------------------------
revno: 103541
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sun 2011-03-06 01:30:16 +0100
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/bookmark.el
  lisp/desktop.el
  lisp/emacs-lock.el
  lisp/net/tramp-cache.el
  lisp/obsolete/fast-lock.el
  lisp/org/ChangeLog
  lisp/org/org-id.el
  lisp/ps-print.el
  lisp/saveplace.el
  lisp/textmodes/reftex.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-05 21:58:57 +0000
+++ b/lisp/ChangeLog    2011-03-06 00:30:16 +0000
@@ -1,3 +1,14 @@
+2011-03-06  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * files.el (delete-directory, copy-directory, list-directory): Use

=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el  2011-02-10 16:56:00 +0000
+++ b/lisp/bookmark.el  2011-03-06 00:30:16 +0000
@@ -2181,7 +2181,8 @@
        (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."

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2011-01-26 08:36:39 +0000
+++ b/lisp/desktop.el   2011-03-06 00:30:16 +0000
@@ -611,7 +611,8 @@
   (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.

=== modified file 'lisp/emacs-lock.el'
--- a/lisp/emacs-lock.el        2011-01-25 04:08:28 +0000
+++ b/lisp/emacs-lock.el        2011-03-06 00:30:16 +0000
@@ -88,7 +88,8 @@
   (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)

=== modified file 'lisp/net/tramp-cache.el'
--- a/lisp/net/tramp-cache.el   2011-02-05 09:52:07 +0000
+++ b/lisp/net/tramp-cache.el   2011-03-06 00:30:16 +0000
@@ -353,7 +353,8 @@
          (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

=== modified file 'lisp/obsolete/fast-lock.el'
--- a/lisp/obsolete/fast-lock.el        2011-01-25 04:08:28 +0000
+++ b/lisp/obsolete/fast-lock.el        2011-03-06 00:30:16 +0000
@@ -840,7 +840,8 @@
 
 (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)

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2011-03-03 08:13:09 +0000
+++ b/lisp/org/ChangeLog        2011-03-06 00:30:16 +0000
@@ -1,3 +1,7 @@
+2011-03-06  Juanma Barranquero  <address@hidden>
+
+       * org-id.el: Don't set `kill-emacs-hook' on noninteractive sessions.
+
 2011-02-10  Stefan Monnier  <address@hidden>
 
        * org-remember.el (org-remember-mode-map):

=== modified file 'lisp/org/org-id.el'
--- a/lisp/org/org-id.el        2011-01-25 04:08:28 +0000
+++ b/lisp/org/org-id.el        2011-03-06 00:30:16 +0000
@@ -519,7 +519,8 @@
     (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."

=== modified file 'lisp/ps-print.el'
--- a/lisp/ps-print.el  2011-02-03 07:21:56 +0000
+++ b/lisp/ps-print.el  2011-03-06 00:30:16 +0000
@@ -6645,7 +6645,8 @@
         (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

=== modified file 'lisp/saveplace.el'
--- a/lisp/saveplace.el 2011-01-25 04:08:28 +0000
+++ b/lisp/saveplace.el 2011-03-06 00:30:16 +0000
@@ -300,7 +300,8 @@
 
 (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)
 

=== modified file 'lisp/textmodes/reftex.el'
--- a/lisp/textmodes/reftex.el  2011-01-25 04:08:28 +0000
+++ b/lisp/textmodes/reftex.el  2011-03-06 00:30:16 +0000
@@ -567,7 +567,7 @@
   "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 @@
   (define-key reftex-mode-map
     reftex-extra-bindings-prefix
     reftex-extra-bindings-map))
-    
+
 
 ;;; =========================================================================
 ;;;
@@ -2568,7 +2568,8 @@
 ;;; 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 ------------------------------------------------------------------