From aab3300517e3f3bd6a2807713bfc964bb7c3d8c5 Mon Sep 17 00:00:00 2001 From: David Maus Date: Fri, 16 Jul 2010 17:23:31 +0200 Subject: [PATCH] Don't throw error when not inside a subtree * org-crypt.el (org-decrypt-entry): Don't throw error when not inside a subtree. --- lisp/org-crypt.el | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index 6411171..8b25213 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -137,25 +137,26 @@ This setting can also be overridden in the CRYPTKEY property." "Decrypt the content of the current headline." (interactive) (require 'epg) - (save-excursion - (org-back-to-heading t) - (forward-line) - (when (looking-at "-----BEGIN PGP MESSAGE-----") - (let* ((beg (point)) - (end (save-excursion - (search-forward "-----END PGP MESSAGE-----") - (forward-line) - (point))) - (epg-context (epg-make-context nil t t)) - (decrypted-text - (decode-coding-string - (epg-decrypt-string - epg-context - (buffer-substring-no-properties beg end)) - 'utf-8))) - (delete-region beg end) - (insert decrypted-text) - nil)))) + (unless (org-before-first-heading-p) + (save-excursion + (org-back-to-heading t) + (forward-line) + (when (looking-at "-----BEGIN PGP MESSAGE-----") + (let* ((beg (point)) + (end (save-excursion + (search-forward "-----END PGP MESSAGE-----") + (forward-line) + (point))) + (epg-context (epg-make-context nil t t)) + (decrypted-text + (decode-coding-string + (epg-decrypt-string + epg-context + (buffer-substring-no-properties beg end)) + 'utf-8))) + (delete-region beg end) + (insert decrypted-text) + nil))))) (defun org-encrypt-entries () "Encrypt all top-level entries in the current buffer." -- 1.7.1