From 0b650649619c2f97d8964ba523113ccb309667dc Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 26 Sep 2012 08:25:05 +0200 Subject: [PATCH] org-capture.el: Add declarations and check is `org-crypt' is loaded (Fix commit ac6409fe) * org-capture.el (org-at-encrypted-entry-p) (org-encrypt-entry, org-decrypt-entry): Declare. (org-capture-set-target-location): Check whether `org-crypt' has been loaded. Thanks to Mike McLean for reporting this. --- lisp/org-capture.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 6aa647233..6a39430ea 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -58,6 +58,9 @@ (declare-function org-table-goto-line "org-table" (N)) (declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) +(declare-function org-at-encrypted-entry-p "org-crypt" ()) +(declare-function org-encrypt-entry "org-crypt" ()) +(declare-function org-decrypt-entry "org-crypt" ()) (defvar org-remember-default-headline) (defvar org-remember-templates) @@ -928,7 +931,7 @@ Store them in the capture property list." (t (error "Invalid capture target specification"))) - (when (org-at-encrypted-entry-p) + (when (and (featurep 'org-crypt) (org-at-encrypted-entry-p)) (org-decrypt-entry) (setq decrypted-hl-pos (save-excursion (and (org-back-to-heading t) (point)))))