mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-15 21:46:27 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Achim Gratz 2013-11-23 16:18:10 +01:00
parent e8bafdd04f 5213e0f704
commit e26b6fb77b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/org-crypt.el
View file

@ -73,6 +73,8 @@
compress-algorithm))
(declare-function epg-encrypt-string "epg"
(context plain recipients &optional sign always-trust))
(defvar epg-context)
(defgroup org-crypt nil
"Org Crypt."
@ -161,7 +163,7 @@ See `org-crypt-disable-auto-save'."
(if (and (string= crypt-key (get-text-property 0 'org-crypt-key str))
(string= (sha1 str) (get-text-property 0 'org-crypt-checksum str)))
(get-text-property 0 'org-crypt-text str)
(set (make-local-variable 'epg-context) (epg-make-context nil t t))
(set (make-local-variable 'epg-context) (epg-make-context nil t t))
(epg-encrypt-string epg-context str (epg-list-keys epg-context crypt-key))))
(defun org-encrypt-entry ()