emacs: Add new option notmuch-search-hide-excluded

[notmuch] / emacs / notmuch-crypto.el

diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 5edfe94cf0cac989a40a97d3b3760dde5d03f78a..a1cf3ddd93e176748e49472750c6138c76c4b27a 100644 (file)
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -125,7 +125,7 @@ mode."
        (setq label (concat "Good signature by key: " fingerprint))
        (setq face 'notmuch-crypto-signature-good-key)
        (when email-or-userid
-         (setq label (concat "Good signature by: " email-or-user-id))
+         (setq label (concat "Good signature by: " email-or-userid))
          (setq face 'notmuch-crypto-signature-good))
        (setq button-action 'notmuch-crypto-sigstatus-good-callback)
        (setq help-msg (concat "Click to list key ID 0x" fingerprint "."))))
@@ -164,7 +164,7 @@ mode."
        (goto-char (point-max))
        (insert (format "-- Key %s in message %s:\n"
                        fingerprint id))
-       (call-process notmuch-crypto-gpg-program nil t t
+       (notmuch--call-process notmuch-crypto-gpg-program nil t t
                      "--batch" "--no-tty" "--list-keys" fingerprint))
       (recenter -1))))
 
@@ -224,7 +224,7 @@ corresponding key when the status button is pressed."
          (with-current-buffer buffer
            (goto-char (point-max))
            (insert (format "--- Retrieving key %s:\n" keyid)))
-         (let ((p (make-process
+         (let ((p (notmuch--make-process
                    :name "notmuch GPG key retrieval"
                    :connection-type 'pipe
                    :buffer buffer
@@ -240,9 +240,9 @@ corresponding key when the status button is pressed."
          (with-current-buffer buffer
            (goto-char (point-max))
            (insert (format "--- Retrieving key %s:\n" keyid))
-           (call-process notmuch-crypto-gpg-program nil t t "--recv-keys" keyid)
+           (notmuch--call-process notmuch-crypto-gpg-program nil t t "--recv-keys" keyid)
            (insert "\n")
-           (call-process notmuch-crypto-gpg-program nil t t "--list-keys" keyid))
+           (notmuch--call-process notmuch-crypto-gpg-program nil t t "--list-keys" keyid))
          (recenter -1))
        (notmuch-show-refresh-view)))))