emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Julien Danjou <julien@danjou.info>
To: emacs-orgmode@gnu.org
Cc: Julien Danjou <julien@danjou.info>, John Wiegley <johnw@gnu.org>,
	Peter Jones <pjones@pmade.com>
Subject: [PATCH] org-crypt: fix decrypt outline display bug
Date: Wed, 26 Jan 2011 13:46:29 +0100	[thread overview]
Message-ID: <1296045989-11068-1-git-send-email-julien@danjou.info> (raw)

* org-crypt.el (org-decrypt-entry): Delete \n on top level heading.
This avoids a display bug showing the heading outlined where the text
is not since it does not have the outline property.
Restore subtree visibility state after decryption.

Cc: John Wiegley <johnw@gnu.org>
Cc: Peter Jones <pjones@pmade.com>
Signed-off-by: Julien Danjou <julien@danjou.info>
 lisp/org-crypt.el |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el
index 1758a81..7c28d70 100644
--- a/lisp/org-crypt.el
+++ b/lisp/org-crypt.el
@@ -140,23 +140,32 @@ This setting can also be overridden in the CRYPTKEY property."
   (unless (org-before-first-heading-p)
       (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)))))
+      (let ((heading-point (point))
+	    (heading-was-invisible-p
+	     (save-excursion
+	       (outline-end-of-heading)
+	       (outline-invisible-p))))
+	(forward-line)
+	(when (looking-at "-----BEGIN PGP MESSAGE-----")
+	  (let* ((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 (point) end))
+		   'utf-8)))
+	    ;; Delete region starting just before point, because the
+	    ;; outline property starts at the \n of the heading.
+	    (delete-region (1- (point)) end)
+	    (insert "\n" decrypted-text)
+	    (when heading-was-invisible-p
+	      (goto-char heading-point)
+	      (org-flag-subtree t))
+	    nil))))))
 (defun org-encrypt-entries ()
   "Encrypt all top-level entries in the current buffer."

             reply	other threads:[~2011-01-26 12:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-26 12:46 Julien Danjou [this message]
2011-02-01 11:54 ` [Accepted] org-crypt: fix decrypt outline display bug Bastien Guerry
2011-02-01 11:56 ` [PATCH] " Bastien

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1296045989-11068-1-git-send-email-julien@danjou.info \
    --to=julien@danjou.info \
    --cc=emacs-orgmode@gnu.org \
    --cc=johnw@gnu.org \
    --cc=pjones@pmade.com \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).