From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 93CA36DE1504 for ; Mon, 11 Jun 2018 16:09:03 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -2.013 X-Spam-Level: X-Spam-Status: No, score=-2.013 tagged_above=-999 required=5 tests=[AWL=0.287, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zIEjnnQWfcnF for ; Mon, 11 Jun 2018 16:09:01 -0700 (PDT) Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu [131.215.239.19]) by arlo.cworth.org (Postfix) with ESMTPS id 9F31F6DE1508 for ; Mon, 11 Jun 2018 16:09:01 -0700 (PDT) Received: from smtp01.caltech.edu (localhost [127.0.0.1]) by smtp02.caltech.edu (Postfix) with ESMTP id 132ED6C09BE for ; Mon, 11 Jun 2018 16:02:59 -0700 (PDT) X-Spam-Scanned: at Caltech-IMSS on smtp01.caltech.edu by amavisd-new Received: from finestructure.net (gwave-71.ligo.caltech.edu [131.215.114.71]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jrollins) by smtp-server.its.caltech.edu (Postfix) with ESMTPSA id BC8D36C09BC for ; Mon, 11 Jun 2018 16:02:58 -0700 (PDT) Received: by finestructure.net (Postfix, from userid 1000) id AE05D61986; Mon, 11 Jun 2018 16:02:58 -0700 (PDT) From: Jameson Graef Rollins To: notmuch@notmuchmail.org Subject: [PATCH] emacs: use new show --decrypt=stash feature in emacs UI Date: Mon, 11 Jun 2018 16:02:58 -0700 Message-Id: <20180611230258.9073-1-jrollins@finestructure.net> X-Mailer: git-send-email 2.17.1 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2018 23:09:03 -0000 This just changes the show --decrypt flag to "stash" in the emacs UI, so that session keys will be stashed in the database when viewing encrypted messages that have not previously been decrypted. As always, this will only happen if the notmuch-crypto-process-mime customization variable is set to "true". --- emacs/notmuch-lib.el | 2 +- emacs/notmuch-query.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index a7e02710..94ddef52 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -593,7 +593,7 @@ the given type." (set-buffer-multibyte nil)) (let ((args `("show" "--format=raw" ,(format "--part=%s" (plist-get part :id)) - ,@(when process-crypto '("--decrypt=true")) + ,@(when process-crypto '("--decrypt=stash")) ,(notmuch-id-to-query (plist-get msg :id)))) (coding-system-for-read (if binaryp 'no-conversion diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el index 563e4acf..8c38eb02 100644 --- a/emacs/notmuch-query.el +++ b/emacs/notmuch-query.el @@ -32,7 +32,7 @@ is a possibly empty forest of replies. " (let ((args '("show" "--format=sexp" "--format-version=4"))) (if notmuch-show-process-crypto - (setq args (append args '("--decrypt=true")))) + (setq args (append args '("--decrypt=stash")))) (setq args (append args search-terms)) (apply #'notmuch-call-notmuch-sexp args))) -- 2.17.1