X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=68272c3aba8bcbfcde8bdf0bc713f5be7a2e9389;hp=35dd081a47611f5c05ca47fd1f60cdd181fe71f3;hb=529bd38e97bf5b597a7e8149293b63c6fb82984e;hpb=0e654d058aa2b5027166bd3e535f85bbc4f214dc

diff --git a/mutt.h b/mutt.h
index 35dd081..68272c3 100644
--- a/mutt.h
+++ b/mutt.h
@@ -65,38 +65,7 @@
 #define INITVAL(x)
 #endif
 
-/* flags for mutt_copy_header() */
-#define CH_UPDATE	1       /* update the status and x-status fields? */
-#define CH_WEED		(1<<1)  /* weed the headers? */
-#define CH_DECODE	(1<<2)  /* do RFC1522 decoding? */
-#define CH_XMIT		(1<<3)  /* transmitting this message? */
-#define CH_FROM		(1<<4)  /* retain the "From " message separator? */
-#define CH_PREFIX	(1<<5)  /* use Prefix string? */
-#define CH_NOSTATUS	(1<<6)  /* supress the status and x-status fields */
-#define CH_REORDER	(1<<7)  /* Re-order output of headers */
-#define CH_NONEWLINE	(1<<8)  /* don't output terminating newline */
-#define CH_MIME		(1<<9)  /* ignore MIME fields */
-#define CH_UPDATE_LEN	(1<<10) /* update Lines: and Content-Length: */
-#define CH_TXTPLAIN	(1<<11) /* generate text/plain MIME headers */
-#define CH_NOLEN	(1<<12) /* don't write Content-Length: and Lines: */
-#define CH_WEED_DELIVERED (1<<13)       /* weed eventual Delivered-To headers */
-#define CH_FORCE_FROM	(1<<14) /* give CH_FROM precedence over CH_WEED? */
-#define CH_NOQFROM	(1<<15) /* give CH_FROM precedence over CH_WEED? */
-#define CH_UPDATE_IRT	(1<<16) /* update In-Reply-To: */
-#define CH_UPDATE_REFS	(1<<17) /* update References: */
-
-/* flags for mutt_enter_string() */
-#define  M_ALIAS   1            /* do alias "completion" by calling up the alias-menu */
-#define  M_FILE    (1<<1)       /* do file completion */
-#define  M_EFILE   (1<<2)       /* do file completion, plus incoming folders */
-#define  M_CMD     (1<<3)       /* do completion on previous word */
-#define  M_PASS    (1<<4)       /* password mode (no echo) */
-#define  M_CLEAR   (1<<5)       /* clear input if printable character is pressed */
-#define  M_COMMAND (1<<6)       /* do command completion */
-#define  M_PATTERN (1<<7)       /* pattern mode - only used for history classes */
-#define  M_LASTFOLDER (1<<8)    /* last-folder mode - hack hack hack */
-
-/* flags for mutt_get_token() */
+/* flags for mutt_extract_token() */
 #define M_TOKEN_EQUAL		1       /* treat '=' as a special */
 #define M_TOKEN_CONDENSE	(1<<1)  /* ^(char) to control chars (macros) */
 #define M_TOKEN_SPACE		(1<<2)  /* don't treat whitespace as a term */
@@ -105,9 +74,6 @@
 #define M_TOKEN_COMMENT		(1<<5)  /* don't reap comments */
 #define M_TOKEN_SEMICOLON	(1<<6)  /* don't treat ; as special */
 
-/* flags for km_dokey() */
-#define M_KM_UNBUFFERED 1       /* don't read from the key buffer */
-
 typedef struct {
   char *data;                   /* pointer to data */
   char *dptr;                   /* current read/write position */
@@ -267,6 +233,7 @@ enum {
 /* quad-option vars */
 enum {
   OPT_ABORT,
+  OPT_ATTACH,
   OPT_BOUNCE,
   OPT_COPY,
   OPT_DELETE,
@@ -349,6 +316,7 @@ enum {
   OPTCONFIRMAPPEND,
   OPTCONFIRMCREATE,
   OPTDELETEUNTAG,
+  OPTDELSP,
   OPTDIGESTCOLLAPSE,
   OPTDUPTHREADS,
   OPTEDITHDRS,
@@ -861,11 +829,6 @@ typedef struct {
   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"