#ifndef _GLOBALS_H
#define _GLOBALS_H
-#include "alias.h"
-
-#include <lib-lib/str.h>
-#include <lib-lib/date.h>
-#include <lib-lib/rx.h>
-
-#include "lib/list.h"
+#include <lib-lib/lib-lib.h>
WHERE void (*mutt_error) (const char *, ...);
WHERE void (*mutt_message) (const char *, ...);
WHERE char Errorbuf[STRING];
WHERE char AttachmentMarker[STRING];
-WHERE char Quotebuf[SHORT_STRING];
+WHERE char Quotebuf[STRING];
WHERE char *MuttDotlock;
WHERE address_t *EnvFrom;
WHERE address_t *From;
-WHERE char *AliasFile;
-WHERE char *AliasFmt;
WHERE char *AssumedCharset;
WHERE char *AttachSep;
WHERE char *Attribution;
WHERE char *AttachFormat;
-WHERE char *Charset;
WHERE char *ComposeFormat;
WHERE char *ConfigCharset;
WHERE char *ContentType;
WHERE rx_t QuoteRegexp;
WHERE rx_t ReplyRegexp;
WHERE rx_t Smileys;
-WHERE rx_t GecosMask;
WHERE rx_t StripWasRegexp;
WHERE char *Preconnect INITVAL (NULL);
WHERE char *Tunnel INITVAL (NULL);
WHERE short NetInc;
-#ifdef MIXMASTER
WHERE char *Mixmaster;
WHERE char *MixEntryFormat;
-#endif
WHERE char *OperatingSystem INITVAL (NULL);
WHERE string_list_t *MimeLookupList INITVAL (0);
WHERE string_list_t *UnIgnore INITVAL (0);
-WHERE list2_t *Alternates INITVAL (0);
-WHERE list2_t *UnAlternates INITVAL (0);
-WHERE list2_t *MailLists INITVAL (0);
-WHERE list2_t *UnMailLists INITVAL (0);
-WHERE list2_t *SubscribedLists INITVAL (0);
-WHERE list2_t *UnSubscribedLists INITVAL (0);
-WHERE SPAM_LIST *SpamList INITVAL (0);
-WHERE list2_t *NoSpamList INITVAL (0);
+WHERE rx_t *Alternates INITVAL (0);
+WHERE rx_t *UnAlternates INITVAL (0);
+WHERE rx_t *MailLists INITVAL (0);
+WHERE rx_t *UnMailLists INITVAL (0);
+WHERE rx_t *SubscribedLists INITVAL (0);
+WHERE rx_t *UnSubscribedLists INITVAL (0);
+WHERE rx_t *SpamList INITVAL (0);
+WHERE rx_t *NoSpamList INITVAL (0);
/* bit vector for boolean variables */
#ifdef MAIN_C
extern unsigned char QuadOptions[];
#endif
-WHERE unsigned short Counter INITVAL (0);
-
#ifdef USE_NNTP
WHERE short NewsPollTimeout;
WHERE short NntpContext;
WHERE int CurrentMenu;
-WHERE alias_t *Aliases INITVAL (0);
WHERE string_list_t *UserHeader INITVAL (0);
/*-- formerly in pgp.h --*/