summaryrefslogtreecommitdiff
path: root/lisp/org
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/org')
-rw-r--r--lisp/org/ChangeLog4
-rw-r--r--lisp/org/org-id.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 5f0908e11c6..54f2eaf2330 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-06 Juanma Barranquero <lekktu@gmail.com>
+
+ * org-id.el: Don't set `kill-emacs-hook' on noninteractive sessions.
+
2011-02-10 Stefan Monnier <monnier@iro.umontreal.ca>
* org-remember.el (org-remember-mode-map):
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index 2f64b8b0bb6..b979097dee3 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."