about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--tools/emacs/config/functions.el9
-rw-r--r--tools/emacs/config/mail-setup.el8
2 files changed, 0 insertions, 17 deletions
diff --git a/tools/emacs/config/functions.el b/tools/emacs/config/functions.el
index 193e1a7412d1..2b9713006837 100644
--- a/tools/emacs/config/functions.el
+++ b/tools/emacs/config/functions.el
@@ -138,15 +138,6 @@
             :sort t
             :action #'magit-status))
 
-(defun warmup-gpg-agent (arg &optional exit)
-  "Function used to warm up the GPG agent before use. This is
-   useful in cases where there is no easy way to make pinentry run
-   in the correct context (such as when sending email)."
-  (interactive)
-  (message "Warming up GPG agent")
-  (epg-sign-string (epg-make-context) "dummy")
-  nil)
-
 (defun bottom-right-window-p ()
   "Determines whether the last (i.e. bottom-right) window of the
   active frame is showing the buffer in which this function is
diff --git a/tools/emacs/config/mail-setup.el b/tools/emacs/config/mail-setup.el
index cc182d346c3a..e3aea7cd730d 100644
--- a/tools/emacs/config/mail-setup.el
+++ b/tools/emacs/config/mail-setup.el
@@ -48,14 +48,6 @@
 ;; handle that gracefully.
 (define-key notmuch-message-mode-map (kbd "C-x C-s") #'ignore)
 
-;; MSMTP decrypts passwords using pass, but pinentry doesn't work
-;; correctly in that setup. This forces a warmup of the GPG agent
-;; before sending the message.
-;;
-;; Note that the sending function is advised because the provided hook
-;; for this seems to run at the wrong time.
-(advice-add 'notmuch-mua-send-common :before 'warmup-gpg-agent)
-
 ;; Define a telephone-line segment for displaying the count of unread,
 ;; important mails in the last window's mode-line:
 (defvar *last-notmuch-count-redraw* 0)