Merge branch 'release'

diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index fc2b53013f8140922fc8fcd37357585f5904e0bc..353f721e2593c2fb977612a088d1378534e7ee21 100644 (file)
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -142,7 +142,7 @@ mode."
     (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 epg-gpg-program nil t t "--batch" "--no-tty" "--list-keys" fingerprint))
       (recenter -1))))
 
 (defun notmuch-crypto-sigstatus-error-callback (button)
@@ -153,9 +153,9 @@ mode."
     (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 epg-gpg-program nil t t "--batch" "--no-tty" "--recv-keys" keyid)
        (insert "\n")
-       (call-process epg-gpg-program nil t t "--list-keys" keyid))
+       (call-process epg-gpg-program nil t t "--batch" "--no-tty" "--list-keys" keyid))
       (recenter -1))
     (notmuch-show-refresh-view)))