Merge branch 'maint'

2012-12-25 03:29:29 +01:00 · 2012-12-25 03:29:29 +01:00 · 99c8732bf8
parent a04ccc40b2 6671e80453
commit 99c8732bf8
1 changed files with 1 additions and 1 deletions
--- a/lisp/org-crypt.el
+++ b/lisp/org-crypt.el
@ -258,7 +258,7 @@ See `org-crypt-disable-auto-save'."
    (save-excursion
      (org-back-to-heading t)
      (search-forward "-----BEGIN PGP MESSAGE-----"
-		      (save-excursion (org-end-of-subtree t)) t))))
+		      (save-excursion (outline-next-heading)) t))))

 (defun org-crypt-use-before-save-magic ()
  "Add a hook to automatically encrypt entries before a file is saved to disk."