diff options
| author | Glenn Morris <rgm@gnu.org> | 2009-10-01 17:52:36 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2009-10-01 17:52:36 +0000 |
| commit | b938bbde4d0aadfdb2b0626656e5628022a8a294 (patch) | |
| tree | 2e63ee422d7c1be23f6c81d421cab5dbbbdd05a9 /lisp/org/org-crypt.el | |
| parent | dcb9734a4442eb9a0deb966425dcaaeaa4d525bb (diff) | |
| download | emacs-b938bbde4d0aadfdb2b0626656e5628022a8a294.tar.gz | |
Convert copyright of authors with assignment to FSF.
Remove trailing whitespace.
Diffstat (limited to 'lisp/org/org-crypt.el')
| -rw-r--r-- | lisp/org/org-crypt.el | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el index 6dfa2ee15e1..eda11a2c819 100644 --- a/lisp/org/org-crypt.el +++ b/lisp/org/org-crypt.el @@ -1,7 +1,6 @@ ;;; org-crypt.el --- Public key encryption for org-mode entries -;; Copyright (C) 2009 Peter Jones <pjones@pmade.com> -;; Copyright (C) 2007 John Wiegley <johnw@gnu.org> +;; Copyright (C) 2007, 2009 Free Software Foundation, Inc. ;; Emacs Lisp Archive Entry ;; Filename: org-crypt.el @@ -95,7 +94,7 @@ heading. This can also be overridden in the CRYPTKEY property." "Returns the encryption key for the current heading." (save-excursion (org-back-to-heading t) - (or (org-entry-get nil "CRYPTKEY" 'selective) + (or (org-entry-get nil "CRYPTKEY" 'selective) org-crypt-key (and (boundp 'epa-file-encrypt-to) epa-file-encrypt-to) (error "No crypt key set")))) @@ -117,7 +116,7 @@ heading. This can also be overridden in the CRYPTKEY property." (org-back-over-empty-lines) (setq end (point) encrypted-text - (epg-encrypt-string + (epg-encrypt-string epg-context (buffer-substring-no-properties beg end) (epg-list-keys epg-context crypt-key))) @@ -137,12 +136,12 @@ heading. This can also be overridden in the CRYPTKEY property." (forward-line) (when (looking-at "-----BEGIN PGP MESSAGE-----") (let* ((beg (point)) - (end (save-excursion + (end (save-excursion (search-forward "-----END PGP MESSAGE-----") (forward-line) (point))) (epg-context (epg-make-context nil t t)) - (decrypted-text + (decrypted-text (decode-coding-string (epg-decrypt-string epg-context @@ -160,17 +159,17 @@ heading. This can also be overridden in the CRYPTKEY property." (defun org-decrypt-entries () (interactive) - (org-scan-tags + (org-scan-tags 'org-decrypt-entry (cdr (org-make-tags-matcher org-crypt-tag-matcher)))) (defun org-crypt-use-before-save-magic () "Adds a hook that will automatically encrypt entries before a file is saved to disk." - (add-hook - 'org-mode-hook + (add-hook + 'org-mode-hook (lambda () (add-hook 'before-save-hook 'org-encrypt-entries nil t)))) - + (provide 'org-crypt) ;; arch-tag: 8202ed2c-221e-4001-9e4b-54674a7e846e |