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 1EC076DE02DB for ; Fri, 7 Sep 2018 04:29:31 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.301 X-Spam-Level: X-Spam-Status: No, score=0.301 tagged_above=-999 required=5 tests=[AWL=-0.141, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.211, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=0.001] 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 imSzesxywL7j for ; Fri, 7 Sep 2018 04:29:30 -0700 (PDT) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by arlo.cworth.org (Postfix) with ESMTPS id 9E2266DE01F5 for ; Fri, 7 Sep 2018 04:29:27 -0700 (PDT) Received: by mail-wr1-f66.google.com with SMTP id k5-v6so14592365wre.10 for ; Fri, 07 Sep 2018 04:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dme-org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=LI61exYrJRWacbzpzkycHUekyEOm/y5HHGSjL6lt/58=; b=k0J7+Yew7yZgPnWv8EMgC96f3rEu3z47ke5qu0suYmggY5s2HY7iswA035yy9+kksJ bce4p9lNAu6l6+CTf9xBMJ0wik4sbmSW/sy+rHnOBTO4WrktTD3kl/Ya2hbeKOD3jAcb flDaC704qS/3Ry+0yaGWNA+o8q8O0fWE8FTuO1JDq1rCzhzCay85T8XiMEQ8e5AT0Pld ekBsiiIFg7+EBLFEEzUJqgU3NmG9L3GH9e2PiEl+G/61GHEjVKUXo3peMiTDVGtZEgiz AavavN6GW6iAouvIrXw7oioNvAYAPrc0oY9krdJzgFq2AknaKsrcXZAIcXVYMjvJ9b+Y RXrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=LI61exYrJRWacbzpzkycHUekyEOm/y5HHGSjL6lt/58=; b=kudZmcGh7wNnHdoZgZnbVFimDNZIRy6M9dr220pqAUNauuVUM931CDjf8Cz1Q29NRQ BsNd7pD8TlJsrfYJ2gAr7AaMgzACDKcQob0NNqNwC+JpQlSueT6718GjoxwrIJM1pZ+o 3K5swWKE62zo37e3ppIJwMmGjmNWXOpVpPaeOamXPcbpFJTXIM0+Od/LxRaofnLD+Kt2 J5krsQnOYVN6F+cWYkMD1SYVqaprTF2VzgSExQUVZVAIHNXqwUzeDRYZJkFodfC7mtRf UAPGR2UV+XO0CdSxYCWbZGfo978tTnCj4Cfn/fVma06SuFSplwTgtq8368M/h2H3hUVz dBaw== X-Gm-Message-State: APzg51CQQfPdgm3HqKASKG3/ytCLehW2dEQK2i7jhZXfgIVVuivOj1ek jbcA8InQfmK1/4bsRpnnNKgg9R9QmAE= X-Google-Smtp-Source: ANB0VdZiWYeIoE/MjoOnGD2GyBTBt61aGl6uR9U1RiDqSftvU35jUp0mk7FRrj93UAMagTD7aUAXhg== X-Received: by 2002:adf:c684:: with SMTP id j4-v6mr5665616wrg.243.1536319766007; Fri, 07 Sep 2018 04:29:26 -0700 (PDT) Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net. [81.149.164.25]) by smtp.gmail.com with ESMTPSA id 66-v6sm10414866wmw.34.2018.09.07.04.29.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Sep 2018 04:29:25 -0700 (PDT) Received: from localhost (disaster-area.hh.sledj.net [local]) by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 7d0ee694 for ; Fri, 7 Sep 2018 11:29:21 +0000 (UTC) From: David Edmondson To: notmuch@notmuchmail.org Subject: [PATCH v2 3/4] emacs: Add notmuch-crypto-gpg-program and use it Date: Fri, 7 Sep 2018 12:29:19 +0100 Message-Id: <20180907112920.3130-4-dme@dme.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180907112920.3130-1-dme@dme.org> References: <20180907112920.3130-1-dme@dme.org> 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: Fri, 07 Sep 2018 11:29:31 -0000 Allow the user to specify the gpg program to use when retriving keys, etc., defaulting to the value of `epg-gpg-program'. --- emacs/notmuch-crypto.el | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el index 81c0eca0..760461e8 100644 --- a/emacs/notmuch-crypto.el +++ b/emacs/notmuch-crypto.el @@ -48,6 +48,11 @@ mode." :type 'boolean :group 'notmuch-crypto) +(defcustom notmuch-crypto-gpg-program epg-gpg-program + "The gpg executable." + :type 'string + :group 'notmuch-crypto) + (defface notmuch-crypto-part-header '((((class color) (background dark)) @@ -149,7 +154,7 @@ by user FROM." (with-selected-window window (with-current-buffer buffer (goto-char (point-max)) - (call-process epg-gpg-program nil t t "--list-keys" fingerprint)) + (call-process notmuch-crypto-gpg-program nil t t "--list-keys" fingerprint)) (recenter -1)))) (declare-function notmuch-show-refresh-view "notmuch-show" (&optional reset-state)) @@ -202,7 +207,7 @@ corresponding key when the status button is pressed." button (format "Retrieving key %s asynchronously..." keyid)) (let ((p (make-process :name "notmuch GPG key retrieval" :buffer buffer - :command (list epg-gpg-program "--recv-keys" keyid) + :command (list notmuch-crypto-gpg-program "--recv-keys" keyid) :connection-type 'pipe :sentinel #'notmuch-crypto--async-key-sentinel ;; Create the process stopped so that @@ -214,13 +219,14 @@ corresponding key when the status button is pressed." (process-put p :notmuch-show-point (point)) (message "Getting the GPG key %s asynchronously..." keyid) (continue-process p))) + (let ((window (display-buffer buffer))) (with-selected-window window (with-current-buffer buffer (goto-char (point-max)) - (call-process epg-gpg-program nil t t "--recv-keys" keyid) + (call-process notmuch-crypto-gpg-program nil t t "--recv-keys" keyid) (insert "\n") - (call-process epg-gpg-program nil t t "--list-keys" keyid)) + (call-process notmuch-crypto-gpg-program nil t t "--list-keys" keyid)) (recenter -1)) (notmuch-show-refresh-view))))) -- 2.11.0