Add $autocrypt_reply.

This allows turning off the force-autocrypt mode when replying to an
autocrypt email.

diff --git a/init.h b/init.h
index 9f177066b4e42799a0c47b1a41a021319f2a487d..ea72a214ae4e3c9f59ea20c9968d1324ad05b11a 100644 (file)
--- a/init.h
+++ b/init.h
@@ -348,6 +348,15 @@ struct option_t MuttVars[] = {
   ** keyring and sqlite database.  See ``$autocryptdoc'' for more details.
   ** (Autocrypt only)
   */
+  { "autocrypt_reply", DT_BOOL, R_NONE, {.l=OPTAUTOCRYPTREPLY}, {.l=1} },
+  /*
+  ** .pp
+  ** When \fIset\fP, replying to an autocrypt email automatically
+  ** enables autocrypt in the reply.  You may want to unset this if you're using
+  ** the same key for autocrypt as normal web-of-trust, so that autocrypt
+  ** isn't forced on for all encrypted replies.
+  ** (Autocrypt only)
+  */
 #endif
   { "autoedit",                DT_BOOL, R_NONE, {.l=OPTAUTOEDIT}, {.l=0} },
   /*

diff --git a/mutt.h b/mutt.h
index 9d02a1d258e766fb17c330b8a6ab31ef361869f9..f36edb2fbeabe53cac005259e8b56dcdb0891ffe 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -381,6 +381,7 @@ enum
   OPTATTACHSPLIT,
 #ifdef USE_AUTOCRYPT
   OPTAUTOCRYPT,
+  OPTAUTOCRYPTREPLY,
 #endif
   OPTAUTOEDIT,
   OPTAUTOSUBSCRIBE,

diff --git a/send.c b/send.c
index 7f037df3f6ae90ec031cc1d10d24251f85e99652..767c5e916d737767921566238c27cdee424b9667 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1906,7 +1906,7 @@ ci_send_message (int flags,               /* send mode */
   {
     if (
 #ifdef USE_AUTOCRYPT
-      option (OPTAUTOCRYPT)
+      option (OPTAUTOCRYPT) && option (OPTAUTOCRYPTREPLY)
 #else
       0
 #endif