summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2011-05-26 08:09:29 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2011-05-26 08:09:29 +0200
commit9f81e43973c1b7cde486db0d43d825c3f15c7f28 (patch)
tree716a3e208c06220a8d8ae9c640ca243c3c08e61a
parent33bae13aeba921218b614a5a0c0b12bf7d911c4f (diff)
downloadorg-mode-9f81e43973c1b7cde486db0d43d825c3f15c7f28.tar.gz
Make sure loading org-crypt does not fail
* lisp/org-crypt.el: Check for `daemonp' before using it.
-rw-r--r--lisp/org-crypt.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el
index b649e39..6a2517f 100644
--- a/lisp/org-crypt.el
+++ b/lisp/org-crypt.el
@@ -209,7 +209,8 @@ This setting can also be overridden in the CRYPTKEY property."
;; 'org-mode-hook
;; (lambda () (add-hook 'auto-save-hook 'org-encrypt-entries nil t))))
-(when (and (not (daemonp)) auto-save-default)
+(when (and (functionp 'daemonp)
+ (not (daemonp)) auto-save-default)
(message "Warning: turn auto-save-mode off in Org buffers containing crypted entries.")
(sit-for 5))