From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [PATCH] org-crypt: when running org-decrypt-entry, only run auto-save-mode check if on an encrypted entry Date: Sat, 8 Oct 2011 18:11:32 +0200 Message-ID: <1E90A07C-2176-4265-934C-9159E1EEE76E@gmail.com> References: <878vqdpy3v.fsf@praet.org> <1314539207-15985-1-git-send-email-pieter@praet.org> Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([140.186.70.92]:33796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RCZUy-0008B7-C1 for emacs-orgmode@gnu.org; Sat, 08 Oct 2011 12:11:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RCZUv-0003Rc-Lb for emacs-orgmode@gnu.org; Sat, 08 Oct 2011 12:11:40 -0400 Received: from mail-ww0-f49.google.com ([74.125.82.49]:52062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RCZUv-0003RV-Bq for emacs-orgmode@gnu.org; Sat, 08 Oct 2011 12:11:37 -0400 Received: by wwp14 with SMTP id 14so6163078wwp.30 for ; Sat, 08 Oct 2011 09:11:36 -0700 (PDT) In-Reply-To: <1314539207-15985-1-git-send-email-pieter@praet.org> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Pieter Praet Cc: emacs-orgmode@gnu.org Accepted, thanks. - Carsten On 28.8.2011, at 15:46, Pieter Praet wrote: > * lisp/org-crypt.el (org-crypt-check-auto-save): New function, see = next change. > * lisp/org-crypt.el (org-decrypt-entry): Break the auto-save-mode = check out > into a separate function, and call it at a later point, to assure it = only > runs when visiting an encrypted entry. >=20 > Currently `org-decrypt-entry' is doing the auto-save-mode check = whenever > it's run, regardless of context, while this only makes sense when run = on > an entry which is actually encrypted (or looks like it, at least). >=20 > Signed-off-by: Pieter Praet > --- >=20 > lisp/org-crypt.el | 54 = +++++++++++++++++++++++++++++----------------------- > 1 files changed, 30 insertions(+), 24 deletions(-) >=20 > diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el > index 5991192..f764404 100644 > --- a/lisp/org-crypt.el > +++ b/lisp/org-crypt.el > @@ -116,6 +116,35 @@ nil : Leave auto-save-mode enabled. > (const :tag "Ask" ask) > (const :tag "Encrypt" encrypt))) >=20 > +(defun org-crypt-check-auto-save () > + "Check whether auto-save-mode is enabled for the current buffer. > + > +`auto-save-mode' may cause leakage when decrypting entries, so > +check whether it's enabled, and decide what to do about it. > + > +See `org-crypt-disable-auto-save'." > + (when buffer-auto-save-file-name > + (cond > + ((or > + (eq org-crypt-disable-auto-save t) > + (and > + (eq org-crypt-disable-auto-save 'ask) > + (y-or-n-p "org-decrypt: auto-save-mode may cause leakage. = Disable it for current buffer? "))) > + (message (concat "org-decrypt: Disabling auto-save-mode for " = (or (buffer-file-name) (current-buffer)))) > + ; The argument to auto-save-mode has to be "-1", since > + ; giving a "nil" argument toggles instead of disabling. > + (auto-save-mode -1)) > + ((eq org-crypt-disable-auto-save nil) > + (message "org-decrypt: Decrypting entry with auto-save-mode = enabled. This may cause leakage.")) > + ((eq org-crypt-disable-auto-save 'encrypt) > + (message "org-decrypt: Enabling re-encryption on auto-save.") > + (add-hook 'auto-save-hook > + (lambda () > + (message "org-crypt: Re-encrypting all decrypted = entries due to auto-save.") > + (org-encrypt-entries)) > + nil t)) > + (t nil)))) > + > (defun org-crypt-key-for-heading () > "Return the encryption key for the current heading." > (save-excursion > @@ -164,30 +193,6 @@ nil : Leave auto-save-mode enabled. > (defun org-decrypt-entry () > "Decrypt the content of the current headline." > (interactive) > - > - ; auto-save-mode may cause leakage, so check whether it's enabled. > - (when buffer-auto-save-file-name > - (cond > - ((or > - (eq org-crypt-disable-auto-save t) > - (and > - (eq org-crypt-disable-auto-save 'ask) > - (y-or-n-p "org-decrypt: auto-save-mode may cause leakage. = Disable it for current buffer? "))) > - (message (concat "org-decrypt: Disabling auto-save-mode for " = (or (buffer-file-name) (current-buffer)))) > - ; The argument to auto-save-mode has to be "-1", since > - ; giving a "nil" argument toggles instead of disabling. > - (auto-save-mode -1)) > - ((eq org-crypt-disable-auto-save nil) > - (message "org-decrypt: Decrypting entry with auto-save-mode = enabled. This may cause leakage.")) > - ((eq org-crypt-disable-auto-save 'encrypt) > - (message "org-decrypt: Enabling re-encryption on auto-save.") > - (add-hook 'auto-save-hook > - (lambda () > - (message "org-crypt: Re-encrypting all decrypted = entries due to auto-save.") > - (org-encrypt-entries)) > - nil t)) > - (t nil))) > - > (require 'epg) > (unless (org-before-first-heading-p) > (save-excursion > @@ -199,6 +204,7 @@ nil : Leave auto-save-mode enabled. > (outline-invisible-p)))) > (forward-line) > (when (looking-at "-----BEGIN PGP MESSAGE-----") > + (org-crypt-check-auto-save) > (let* ((end (save-excursion > (search-forward "-----END PGP MESSAGE-----") > (forward-line) > --=20 > 1.7.5.4 >=20 >=20