projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fix typo for nntp_ask_followup_to (reported by mess-mate)
[apps/madmutt.git]
/
mutt.h
diff --git
a/mutt.h
b/mutt.h
index
9875925
..
c74e8fd
100644
(file)
--- a/
mutt.h
+++ b/
mutt.h
@@
-8,8
+8,8
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#ifndef MUTT_H
-#define MUTT_H
+#ifndef
_
MUTT_H
+#define
_
MUTT_H
#include "config.h"
#include "config.h"
@@
-44,6
+44,7
@@
#include "rfc822.h"
#include "hash.h"
#include "charset.h"
#include "rfc822.h"
#include "hash.h"
#include "charset.h"
+#include "lib/rx.h"
#ifndef HAVE_WC_FUNCS
# ifdef MB_LEN_MAX
#ifndef HAVE_WC_FUNCS
# ifdef MB_LEN_MAX
@@
-52,11
+53,7
@@
# define MB_LEN_MAX 16
#endif
# define MB_LEN_MAX 16
#endif
-#ifdef SUBVERSION
-# define MUTT_VERSION (VERSION SUBVERSION)
-#else
# define MUTT_VERSION (VERSION)
# define MUTT_VERSION (VERSION)
-#endif
/* nifty trick I stole from ELM 2.5alpha. */
#ifdef MAIN_C
/* nifty trick I stole from ELM 2.5alpha. */
#ifdef MAIN_C
@@
-67,8
+64,6
@@
#define INITVAL(x)
#endif
#define INITVAL(x)
#endif
-#include "mutt_regex.h"
-
/* flags for mutt_copy_header() */
#define CH_UPDATE 1 /* update the status and x-status fields? */
#define CH_WEED (1<<1) /* weed the headers? */
/* flags for mutt_copy_header() */
#define CH_UPDATE 1 /* update the status and x-status fields? */
#define CH_WEED (1<<1) /* weed the headers? */
@@
-347,6
+342,7
@@
enum {
OPTBEEP,
OPTBEEPNEW,
OPTBOUNCEDELIVERED,
OPTBEEP,
OPTBEEPNEW,
OPTBOUNCEDELIVERED,
+ OPTBRAILLEFRIENDLY,
OPTCHECKNEW,
OPTCOLLAPSEUNREAD,
OPTCONFIRMAPPEND,
OPTCHECKNEW,
OPTCOLLAPSEUNREAD,
OPTCONFIRMAPPEND,
@@
-367,6
+363,9
@@
enum {
OPTFORWQUOTE,
#if USE_HCACHE
OPTHCACHEVERIFY,
OPTFORWQUOTE,
#if USE_HCACHE
OPTHCACHEVERIFY,
+#if HAVE_QDBM
+ OPTHCACHECOMPRESS,
+#endif /* HAVE_QDBM */
#endif
OPTHDRS,
OPTHEADER,
#endif
OPTHDRS,
OPTHEADER,
@@
-443,6
+442,7
@@
enum {
OPTSORTRE,
OPTSPAMSEP,
OPTSTATUSONTOP,
OPTSORTRE,
OPTSPAMSEP,
OPTSTATUSONTOP,
+ OPTSTRICTMAILTO,
OPTSTRICTMIME,
OPTSTRICTTHREADS,
OPTSTRIPWAS,
OPTSTRICTMIME,
OPTSTRICTTHREADS,
OPTSTRIPWAS,
@@
-571,13
+571,8
@@
typedef struct list_t {
struct list_t *next;
} LIST;
struct list_t *next;
} LIST;
-typedef struct rx_list_t {
- REGEXP *rx;
- struct rx_list_t *next;
-} RX_LIST;
-
typedef struct spam_list_t {
typedef struct spam_list_t {
-
REGEXP
*rx;
+
rx_t
*rx;
int nmatch;
char *template;
struct spam_list_t *next;
int nmatch;
char *template;
struct spam_list_t *next;
@@
-586,9
+581,7
@@
typedef struct spam_list_t {
#define mutt_new_list() safe_calloc (1, sizeof (LIST))
#define mutt_new_spam_list() safe_calloc (1, sizeof (SPAM_LIST))
#define mutt_new_list() safe_calloc (1, sizeof (LIST))
#define mutt_new_spam_list() safe_calloc (1, sizeof (SPAM_LIST))
-#define mutt_new_rx_list() safe_calloc (1, sizeof (RX_LIST))
void mutt_free_list (LIST **);
void mutt_free_list (LIST **);
-void mutt_free_rx_list (RX_LIST **);
void mutt_free_spam_list (SPAM_LIST **);
LIST *mutt_copy_list (LIST *);
int mutt_matches_ignore (const char *, LIST *);
void mutt_free_spam_list (SPAM_LIST **);
LIST *mutt_copy_list (LIST *);
int mutt_matches_ignore (const char *, LIST *);
@@
-893,6
+886,7
@@
typedef struct {
unsigned int quiet:1; /* inhibit status messages? */
unsigned int collapsed:1; /* are all threads collapsed? */
unsigned int closing:1; /* mailbox is being closed */
unsigned int quiet:1; /* inhibit status messages? */
unsigned int collapsed:1; /* are all threads collapsed? */
unsigned int closing:1; /* mailbox is being closed */
+ unsigned int counting:1; /* do we just want to cound? */
} CONTEXT;
typedef struct attachptr {
} CONTEXT;
typedef struct attachptr {
@@
-946,4
+940,4
@@
int state_printf (STATE *, const char *, ...);
#include "lib.h"
#include "globals.h"
#include "lib.h"
#include "globals.h"
-#endif /*MUTT_H */
+#endif /*
!_
MUTT_H */