projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
mutt.h
diff --git
a/mutt.h
b/mutt.h
index
226eda0
..
7e8e495
100644
(file)
--- a/
mutt.h
+++ b/
mutt.h
@@
-167,7
+167,6
@@
enum {
M_LIMIT,
M_EXPIRED,
M_SUPERSEDED,
M_LIMIT,
M_EXPIRED,
M_SUPERSEDED,
- M_REALNAME,
/* actions for mutt_pattern_comp/mutt_pattern_exec */
M_AND,
/* actions for mutt_pattern_comp/mutt_pattern_exec */
M_AND,
@@
-193,6
+192,7
@@
enum {
M_REFERENCE,
M_RECIPIENT,
M_LIST,
M_REFERENCE,
M_RECIPIENT,
M_LIST,
+ M_SUBSCRIBED_LIST,
M_PERSONAL_RECIP,
M_PERSONAL_FROM,
M_ADDRESS,
M_PERSONAL_RECIP,
M_PERSONAL_FROM,
M_ADDRESS,
@@
-204,6
+204,8
@@
enum {
#ifdef USE_NNTP
M_NEWSGROUPS,
#endif
#ifdef USE_NNTP
M_NEWSGROUPS,
#endif
+ M_REALNAME,
+ M_MULTIPART,
/* Options for Mailcap lookup */
M_EDIT,
/* Options for Mailcap lookup */
M_EDIT,
@@
-233,6
+235,7
@@
enum {
/* quad-option vars */
enum {
OPT_ABORT,
/* quad-option vars */
enum {
OPT_ABORT,
+ OPT_ATTACH,
OPT_BOUNCE,
OPT_COPY,
OPT_DELETE,
OPT_BOUNCE,
OPT_COPY,
OPT_DELETE,
@@
-315,6
+318,7
@@
enum {
OPTCONFIRMAPPEND,
OPTCONFIRMCREATE,
OPTDELETEUNTAG,
OPTCONFIRMAPPEND,
OPTCONFIRMCREATE,
OPTDELETEUNTAG,
+ OPTDELSP,
OPTDIGESTCOLLAPSE,
OPTDUPTHREADS,
OPTEDITHDRS,
OPTDIGESTCOLLAPSE,
OPTDUPTHREADS,
OPTEDITHDRS,
@@
-433,6
+437,7
@@
enum {
OPTWRAPSEARCH,
OPTWRITEBCC, /* write out a bcc header? */
OPTXMAILER,
OPTWRAPSEARCH,
OPTWRITEBCC, /* write out a bcc header? */
OPTXMAILER,
+ OPTXMAILTO, /* 1 if $edit_header is forcebly set */
OPTXTERMSETTITLES,
OPTCRYPTUSEGPGME,
OPTXTERMSETTITLES,
OPTCRYPTUSEGPGME,
@@
-762,7
+767,7
@@
typedef struct thread {
/* flag to mutt_pattern_comp() */
/* flag to mutt_pattern_comp() */
-#define M_FULL_MSG
1
/* enable body and header matching */
+#define M_FULL_MSG
(1<<0)
/* enable body and header matching */
typedef enum {
M_MATCH_FULL_ADDRESS = 1
typedef enum {
M_MATCH_FULL_ADDRESS = 1
@@
-770,12
+775,14
@@
typedef enum {
typedef struct pattern_t {
short op;
typedef struct pattern_t {
short op;
- short not;
- short alladdr;
+ unsigned int not : 1;
+ unsigned int alladdr : 1;
+ unsigned int stringmatch : 1;
int min;
int max;
struct pattern_t *next;
struct pattern_t *child; /* arguments to logical op */
int min;
int max;
struct pattern_t *next;
struct pattern_t *child; /* arguments to logical op */
+ char* str;
regex_t *rx;
} pattern_t;
regex_t *rx;
} pattern_t;
@@
-827,11
+834,6
@@
typedef struct {
unsigned int counting:1; /* do we just want to cound? */
} CONTEXT;
unsigned int counting:1; /* do we just want to cound? */
} CONTEXT;
-#include "ascii.h"
-#include "alias.h"
-#include "buffer.h"
-#include "state.h"
-#include "enter.h"
#include "protos.h"
#include "lib.h"
#include "globals.h"
#include "protos.h"
#include "lib.h"
#include "globals.h"