Add autocrypt config vars.

diff --git a/doc/makedoc-defs.h b/doc/makedoc-defs.h
index 78a4ebc05e24a07646d46679c7345c26de1eee81..a5e631fba5ce44009c0ce4c3e40188cb132fb31b 100644 (file)
--- a/doc/makedoc-defs.h
+++ b/doc/makedoc-defs.h
@@ -67,4 +67,7 @@
 # ifndef USE_COMPRESSED
 #  define USE_COMPRESSED
 # endif
+# ifndef USE_AUTOCRYPT
+#  define USE_AUTOCRYPT
+# endif
 #endif

diff --git a/globals.h b/globals.h
index 4d508221581604fd97d2789c71a2c5d9ba10e798..68c7e40c00bc513b5dcdbfcace20b6969fe2df9b 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -40,6 +40,9 @@ WHERE char *Attribution;
 WHERE char *AttributionLocale;
 WHERE char *AttachCharset;
 WHERE char *AttachFormat;
+#ifdef USE_AUTOCRYPT
+WHERE char *AutocryptDir;
+#endif
 WHERE char *Charset;
 WHERE char *ComposeFormat;
 WHERE char *ConfigCharset;

diff --git a/init.h b/init.h
index 28eb37ba98d8fe743aa256470b319bd1136c26f5..c2b8fa6d30e00adf908e26d5799ad43fe7e291d1 100644 (file)
--- a/init.h
+++ b/init.h
@@ -317,6 +317,21 @@ struct option_t MuttVars[] = {
   ** unset, you must first use the \fC<tag-prefix>\fP function (bound to ``;''
   ** by default) to make the next function apply to all tagged messages.
   */
+#ifdef USE_AUTOCRYPT
+  { "autocrypt",       DT_BOOL, R_NONE, {.l=OPTAUTOCRYPT}, {.l=0} },
+  /*
+  ** .pp
+  ** When \fIset\fP, enables autocrypt, https://autocrypt.org/, which provides
+  ** passive encryption protection with keys exchanged via headers.
+  ** TODO: add a section in the manual describing this is more detail.
+  */
+  { "autocrypt_dir",   DT_PATH, R_NONE, {.p=&AutocryptDir}, {.p="~/.mutt/autocrypt"} },
+  /*
+  ** .pp
+  ** This variable sets where autocrypt files are stored, including the GPG
+  ** keyring and sqlite database.
+  */
+#endif
   { "autoedit",                DT_BOOL, R_NONE, {.l=OPTAUTOEDIT}, {.l=0} },
   /*
   ** .pp

diff --git a/mutt.h b/mutt.h
index 77082bdbb5b3e2a0d24e35773bd1e54436fa6a43..35a3ae604dbcc322373a8b91abc2dd8849e0f976 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -379,6 +379,9 @@ enum
   OPTASKBCC,
   OPTASKCC,
   OPTATTACHSPLIT,
+#ifdef USE_AUTOCRYPT
+  OPTAUTOCRYPT,
+#endif
   OPTAUTOEDIT,
   OPTAUTOSUBSCRIBE,
   OPTAUTOTAG,