From: Pieter Praet <pieter@praet.org>
To: emacs-orgmode@gnu.org
Cc: Dave Abrahams <dave@boostpro.com>, Bastien <bzg@altern.org>,
Nick Dokos <nicholas.dokos@hp.com>
Subject: [PATCH] org-crypt: make org-decrypt disable auto-save-mode (configurable)
Date: Sun, 26 Jun 2011 10:38:04 +0200 [thread overview]
Message-ID: <1309077484-1707-1-git-send-email-pieter@praet.org> (raw)
In-Reply-To: <8762ntjdwr.fsf@praet.org>
Signed-off-by: Pieter Praet <pieter@praet.org>
---
This is appears to be the only solution that doesn't cause
the production of inordinate amounts of cortisol.
I've also added a warning re the broken state of `auto-save-hook'.
lisp/org-crypt.el | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el
index 4bff7a1..0a0ce96 100644
--- a/lisp/org-crypt.el
+++ b/lisp/org-crypt.el
@@ -94,6 +94,15 @@ This setting can also be overridden in the CRYPTKEY property."
:type 'string
:group 'org-crypt)
+(defcustom org-crypt-disable-auto-save t
+ "What org-decrypt should do if `auto-save-default' is enabled.
+
+t : Disable it for the current buffer prior to decrypting an entry.
+nil : Leave it enabled."
+ :group 'org-crypt
+ :type '(choice (const :tag "Always" t)
+ (const :tag "Never" nil)))
+
(defun org-crypt-key-for-heading ()
"Return the encryption key for the current heading."
(save-excursion
@@ -142,6 +151,24 @@ This setting can also be overridden in the CRYPTKEY property."
(defun org-decrypt-entry ()
"Decrypt the content of the current headline."
(interactive)
+
+ ; auto-save-mode causes leakage, so check whether it's enabled.
+ (when auto-save-default
+ ; Ideally, we'd check whether it's enabled for the current buffer,
+ ; using the buffer-local variable `auto-save-mode', but the
+ ; `auto-save-mode' function doesn't set this, so we have to check
+ ; the global variable `auto-save-default' instead.
+ ; Consequently, the following will run regardless of whether
+ ; `auto-save-mode' is enabled for the current buffer, spamming the
+ ; *Messages* buffer.
+ (if (eq org-crypt-disable-auto-save t)
+ (progn
+ (message "org-decrypt: Disabling auto-save-mode for current buffer to prevent leakage.")
+ ; The argument to auto-save-mode has to be "-1", since
+ ; giving a "nil" argument toggles instead of disabling.
+ (auto-save-mode -1))
+ (message "org-decrypt: WARNING! auto-save-mode is enabled globally. This may cause leakage.")))
+
(require 'epg)
(unless (org-before-first-heading-p)
(save-excursion
@@ -204,15 +231,16 @@ This setting can also be overridden in the CRYPTKEY property."
;; FIXME Find a better way to encrypt Org auto-saved buffers?
;; When `auto-save-default' is non-nil, make sure entries are
;; encrypted before auto-saving
+;; NOTE: auto-save-hook does NOT work, so don't rely on it!
;; (when auto-save-default
;; (add-hook
;; 'org-mode-hook
;; (lambda () (add-hook 'auto-save-hook 'org-encrypt-entries nil t))))
-(when (and (functionp 'daemonp)
- (not (daemonp)) auto-save-default)
- (message "Warning: turn auto-save-mode off in Org buffers containing crypted entries.")
- (sit-for 1))
+;; (when (and (functionp 'daemonp)
+;; (not (daemonp)) auto-save-default)
+;; (message "Warning: turn auto-save-mode off in Org buffers containing crypted entries.")
+;; (sit-for 1))
(add-hook 'org-reveal-start-hook 'org-decrypt-entry)
--
1.7.4.1
next prev parent reply other threads:[~2011-06-26 8:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-30 21:34 Documentation suggestion re: buffers containing crypted entries Bill Day
2011-05-02 3:42 ` Darlan Cavalcante Moreira
2011-06-12 20:41 ` Dave Abrahams
2011-06-24 10:04 ` Eric S Fraga
2011-06-24 10:53 ` Bastien
2011-06-24 13:42 ` Eric S Fraga
2011-06-27 16:56 ` Bastien
2011-06-28 13:29 ` Darlan Cavalcante Moreira
2011-06-24 21:03 ` [PATCH] org-crypt: only warn about auto-save-mode when running org-decrypt Pieter Praet
2011-06-24 21:50 ` Nick Dokos
2011-06-26 6:38 ` Pieter Praet
2011-06-26 8:38 ` Pieter Praet [this message]
2011-06-27 16:31 ` Bastien
2011-06-28 6:55 ` Pieter Praet
2011-06-28 6:57 ` [PATCH] org-crypt: make org-decrypt disable auto-save-mode (configurable) Pieter Praet
2011-06-28 10:04 ` Bastien
2011-06-28 10:05 ` [PATCH] org-crypt: only warn about auto-save-mode when running org-decrypt Bastien
2011-06-24 11:57 ` Documentation suggestion re: buffers containing crypted entries Bernt Hansen
2011-06-27 16:55 ` 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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
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=1309077484-1707-1-git-send-email-pieter@praet.org \
--to=pieter@praet.org \
--cc=bzg@altern.org \
--cc=dave@boostpro.com \
--cc=emacs-orgmode@gnu.org \
--cc=nicholas.dokos@hp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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).