X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=62f829be8726049c518b4d350b4506bdcaaa2ef9;hp=6c079bedfd13b9ec6129ec737645a5947f40bdaf;hb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c;hpb=69411872c23f91f24f76cf3a4a4b3be67640e44d

diff --git a/globals.h b/globals.h
index 6c079be..62f829b 100644
--- a/globals.h
+++ b/globals.h
@@ -11,7 +11,7 @@
 
 #include "alias.h"
 
-#include "lib/str.h"
+#include <lib-lib/str.h>
 #include "lib/list.h"
 #include "lib/rx.h"
 
@@ -29,6 +29,7 @@ WHERE char Quotebuf[SHORT_STRING];
 WHERE char *MuttDotlock;
 #endif
 
+WHERE ADDRESS *EnvFrom;
 WHERE ADDRESS *From;
 
 WHERE char *AliasFile;
@@ -47,6 +48,7 @@ WHERE char *DisplayFilter;
 WHERE char *DsnNotify;
 WHERE char *DsnReturn;
 WHERE char *Editor;
+WHERE char *EditorHeaders;
 WHERE char *EscChar;
 WHERE char *FileCharset;
 WHERE char *FolderFormat;
@@ -71,7 +73,7 @@ WHERE char *Locale;
 WHERE char *MailcapPath;
 WHERE char *Maildir;
 
-#if USE_HCACHE
+#ifdef USE_HCACHE
 WHERE char *HeaderCache;
 #if HAVE_GDBM || HAVE_DB4
 WHERE char *HeaderCachePageSize;
@@ -83,6 +85,7 @@ WHERE char *MhUnseen;
 WHERE char *MsgFmt;
 WHERE char *MsgIdFormat;
 
+WHERE rx_t AttachRemindRegexp;
 WHERE rx_t Mask;
 WHERE rx_t QuoteRegexp;
 WHERE rx_t ReplyRegexp;
@@ -93,6 +96,7 @@ WHERE rx_t StripWasRegexp;
 #ifdef USE_SOCKET
 WHERE char *Preconnect INITVAL (NULL);
 WHERE char *Tunnel INITVAL (NULL);
+WHERE short NetInc;
 #endif /* USE_SOCKET */
 
 #ifdef MIXMASTER
@@ -144,7 +148,6 @@ WHERE char *SimpleSearch;
 #if defined(USE_LIBESMTP)
 WHERE char *SmtpAuthUser;
 WHERE char *SmtpAuthPass;
-WHERE char *SmtpEnvFrom;
 WHERE char *SmtpHost;
 WHERE unsigned short SmtpPort;
 WHERE char *SmtpUseTLS;
@@ -182,6 +185,10 @@ WHERE char *LastFolder;
 
 WHERE LIST *AutoViewList INITVAL (0);
 WHERE LIST *AlternativeOrderList INITVAL (0);
+WHERE LIST *AttachAllow INITVAL(0);
+WHERE LIST *AttachExclude INITVAL(0);
+WHERE LIST *InlineAllow INITVAL(0);
+WHERE LIST *InlineExclude INITVAL(0);
 WHERE LIST *HeaderOrderList INITVAL (0);
 WHERE LIST *Ignore INITVAL (0);
 WHERE LIST *MimeLookupList INITVAL (0);
@@ -229,6 +236,7 @@ WHERE short Timeout;
 WHERE short Umask INITVAL (0077);
 WHERE short WrapMargin;
 WHERE short WriteInc;
+WHERE short MaxDispRecips;
 WHERE short MaxLineLength;
 
 WHERE short ScoreThresholdDelete;
@@ -278,7 +286,6 @@ WHERE char *SmimeCryptAlg;
 WHERE short SmimeTimeout;
 WHERE char *SmimeCertificates;
 WHERE char *SmimeKeys;
-WHERE char *SmimeCryptAlg;
 WHERE char *SmimeCALocation;
 WHERE char *SmimeVerifyCommand;
 WHERE char *SmimeVerifyOpaqueCommand;