diff options
author | Thomas Roessler <roessler@does-not-exist.org> | 2004-07-14 04:34:07 +0000 |
---|---|---|
committer | Thomas Roessler <roessler@does-not-exist.org> | 2004-07-14 04:34:07 +0000 |
commit | 3ac67380a0c76d2d9ac9a7f6450891f393a83bfe (patch) | |
tree | 5e210b96d9551174be51e9c8dd15e13f09833f09 | |
parent | 3170ef26b207694d528495e43c2b7a6a474e3f74 (diff) |
Fix a cvs commit SNAFU: This commit undoes the include_onlyfirst
patch, but leaves the generic spam detection by David Champion in
place (which, erroneously, hadn't been committed automatically).
-rw-r--r-- | copy.c | 2 | ||||
-rw-r--r-- | copy.h | 1 | ||||
-rw-r--r-- | handler.c | 6 | ||||
-rw-r--r-- | init.h | 6 | ||||
-rw-r--r-- | mutt.h | 3 | ||||
-rw-r--r-- | send.c | 2 |
6 files changed, 2 insertions, 18 deletions
@@ -586,8 +586,6 @@ _mutt_copy_message (FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body, s.flags |= M_WEED; if (flags & M_CM_CHARCONV) s.flags |= M_CHARCONV; - if (flags & M_CM_REPLYING) - s.flags |= M_REPLYING; if (WithCrypto && flags & M_CM_VERIFY) s.flags |= M_VERIFY; @@ -25,7 +25,6 @@ #define M_CM_WEED (1<<5) /* weed message/rfc822 attachment headers */ #define M_CM_CHARCONV (1<<6) /* perform character set conversions */ #define M_CM_PRINTING (1<<7) /* printing the message - display light */ -#define M_CM_REPLYING (1<<8) /* replying the message */ #define M_CM_DECODE_PGP (1<<8) /* used for decoding PGP messages */ @@ -1485,9 +1485,6 @@ void multipart_handler (BODY *a, STATE *s) } mutt_body_handler (p, s); state_putc ('\n', s); - if ((s->flags & M_REPLYING) - && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE)) - break; } if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || @@ -1921,7 +1918,6 @@ void mutt_body_handler (BODY *b, STATE *s) s->fpin = fp; } } - s->flags |= M_FIRSTDONE; } else if (s->flags & M_DISPLAY) { @@ -1939,5 +1935,5 @@ void mutt_body_handler (BODY *b, STATE *s) } bail: - s->flags = oflags | (s->flags & M_FIRSTDONE); + s->flags = oflags; } @@ -884,12 +884,6 @@ struct option_t MuttVars[] = { ** Controls whether or not a copy of the message(s) you are replying to ** is included in your reply. */ - { "include_onlyfirst", DT_BOOL, R_NONE, OPTINCLUDEONLYFIRST, 0}, - /* - ** .pp - ** Controls whether or not Mutt includes only the first attachment - ** of the message you are replying. - */ { "indent_string", DT_STR, R_NONE, UL &Prefix, UL "> " }, /* ** .pp @@ -374,7 +374,6 @@ enum OPTSSLSYSTEMCERTS, #endif OPTIMPLICITAUTOVIEW, - OPTINCLUDEONLYFIRST, OPTKEEPFLAGGED, OPTMAILCAPSANITIZE, OPTMAILDIRTRASH, @@ -859,8 +858,6 @@ typedef struct #define M_WEED (1<<3) /* weed headers even when not in display mode */ #define M_CHARCONV (1<<4) /* Do character set conversions */ #define M_PRINTING (1<<5) /* are we printing? - M_DISPLAY "light" */ -#define M_REPLYING (1<<6) /* are we replying? */ -#define M_FIRSTDONE (1<<7) /* the first attachment has been done */ #define state_set_prefix(s) ((s)->flags |= M_PENDINGPREFIX) #define state_reset_prefix(s) ((s)->flags &= ~M_PENDINGPREFIX) @@ -403,7 +403,7 @@ void mutt_make_post_indent (CONTEXT *ctx, HEADER *cur, FILE *out) static int include_reply (CONTEXT *ctx, HEADER *cur, FILE *out) { - int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV | M_CM_REPLYING; + int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV; int chflags = CH_DECODE; if (WithCrypto && (cur->security & ENCRYPT)) |