X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=cad0fdc3b36d81f25ec514a9322491c949c32e0f;hp=e9c0f85c26dd0e0b025b2f5bb6b50132ff0d6f8f;hb=6aac4a85332ec3647c29a7b996cade972895a8b8;hpb=488a60c8ef78872f38bbb3439a75cb2cda985a12

diff --git a/init.h b/init.h
index e9c0f85..cad0fdc 100644
--- a/init.h
+++ b/init.h
@@ -51,11 +51,13 @@
 #define R_NONE          0
 #define R_INDEX         (1<<0)
 #define R_PAGER         (1<<1)
+#define R_BOTH          (R_INDEX|R_PAGER)
+
+/* TODO:MC: will go in the the thread module */
 #define R_RESORT        (1<<2)  /* resort the mailbox */
 #define R_RESORT_SUB    (1<<3)  /* resort subthreads */
 #define R_RESORT_INIT   (1<<4)  /* resort from scratch */
 #define R_TREE          (1<<5)  /* redraw the thread tree */
-#define R_BOTH          (R_INDEX|R_PAGER)
 #define R_RESORT_BOTH   (R_RESORT|R_RESORT_SUB)
 
 struct option_t {
@@ -136,29 +138,6 @@ struct option_t MuttVars[] = {
    ** check only happens after the \fIfirst\fP edit of the file).  When set
    ** to \fIno\fP, composition will never be aborted.
    */
-  {"alias_file", DT_PATH, R_NONE, UL &AliasFile, "~/.madmuttrc"},
-  /*
-   ** .pp
-   ** The default file in which to save aliases created by the
-   ** ``$create-alias'' function.
-   ** .pp
-   ** \fBNote:\fP Madmutt will not automatically source this file; you must
-   ** explicitly use the ``$source'' command for it to be executed.
-   */
-  {"alias_format", DT_STR, R_NONE, UL &AliasFmt, "%4n %2f %t %-10a   %r"},
-  /*
-   ** .pp
-   ** Specifies the format of the data displayed for the ``alias'' menu. The
-   ** following \fTprintf(3)\fP-style sequences are available:
-   ** .pp
-   ** .dl
-   ** .dt %a .dd alias name
-   ** .dt %f .dd flags - currently, a "d" for an alias marked for deletion
-   ** .dt %n .dd index number
-   ** .dt %r .dd address which alias expands to
-   ** .dt %t .dd character which indicates if the alias is tagged for inclusion
-   ** .de
-   */
   {"allow_8bit", DT_BOOL, R_NONE, OPTALLOW8BIT, "yes" },
   /*
    ** .pp
@@ -203,23 +182,6 @@ struct option_t MuttVars[] = {
    ** If \fIset\fP, Madmutt will prompt you for carbon-copy (Cc) recipients before
    ** editing the body of an outgoing message.
    */
-  {"assumed_charset", DT_STR, R_NONE, UL &AssumedCharset, "us-ascii"},
-  /*
-   ** .pp
-   ** This variable is a colon-separated list of character encoding
-   ** schemes for messages without character encoding indication.
-   ** Header field values and message body content without character encoding
-   ** indication would be assumed that they are written in one of this list.
-   ** By default, all the header fields and message body without any charset
-   ** indication are assumed to be in \fTus-ascii\fP.
-   ** .pp
-   ** For example, Japanese users might prefer this:
-   ** .pp
-   ** \fTset assumed_charset="iso-2022-jp:euc-jp:shift_jis:utf-8"\fP
-   ** .pp
-   ** However, only the first content is valid for the message body.
-   ** This variable is valid only if $$strict_mime is unset.
-   */
 #ifdef USE_NNTP
   {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, "no" },
   /*
@@ -317,18 +279,6 @@ struct option_t MuttVars[] = {
    ** unset, you must first use the ``tag-prefix'' function (default: "\fT;\fP") to
    ** make the next function apply to all tagged messages.
    */
-  {"beep", DT_BOOL, R_NONE, OPTBEEP, "yes" },
-  /*
-   ** .pp
-   ** When this variable is \fIset\fP, Madmutt will beep when an error occurs.
-   */
-  {"beep_new", DT_BOOL, R_NONE, OPTBEEPNEW, "no" },
-  /*
-   ** .pp
-   ** When this variable is \fIset\fP, Madmutt will beep whenever it prints a message
-   ** notifying you of new mail.  This is independent of the setting of the
-   ** ``$$beep'' variable.
-   */
   {"bounce", DT_QUAD, R_NONE, OPT_BOUNCE, "ask-yes" },
   /*
    ** .pp
@@ -364,11 +314,6 @@ struct option_t MuttVars[] = {
    ** as read when you leaving it.
    */
 #endif
-  {"charset", DT_STR, R_NONE, UL &Charset, "" },
-  /*
-   ** .pp
-   ** Character set your terminal uses to display and enter textual data.
-   */
   {"check_new", DT_BOOL, R_NONE, OPTCHECKNEW, "yes" },
   /*
    ** .pp
@@ -543,33 +488,6 @@ struct option_t MuttVars[] = {
    ** is viewed it is passed as standard input to $$display_filter, and the
    ** filtered message is read from the standard output.
    */
-  {"dsn_notify", DT_STR, R_NONE, UL &DsnNotify, ""},
-  /*
-   ** .pp
-   ** \fBNote:\fP you should not enable this unless you are using Sendmail
-   ** 8.8.x or greater or in connection with the SMTP support via libESMTP.
-   ** .pp
-   ** This variable sets the request for when notification is returned.  The
-   ** string consists of a comma separated list (no spaces!) of one or more
-   ** of the following: \fInever\fP, to never request notification,
-   ** \fIfailure\fP, to request notification on transmission failure,
-   ** \fIdelay\fP, to be notified of message delays, \fIsuccess\fP, to be
-   ** notified of successful transmission.
-   ** .pp
-   ** Example: \fTset dsn_notify="failure,delay"\fP
-   */
-  {"dsn_return", DT_STR, R_NONE, UL &DsnReturn, ""},
-  /*
-   ** .pp
-   ** \fBNote:\fP you should not enable this unless you are using Sendmail
-   ** 8.8.x or greater or in connection with the SMTP support via libESMTP.
-   ** .pp
-   ** This variable controls how much of your message is returned in DSN
-   ** messages.  It may be set to either \fIhdrs\fP to return just the
-   ** message header, or \fIfull\fP to return the full message.
-   ** .pp
-   ** Example: \fTset dsn_return=hdrs\fP
-   */
   {"duplicate_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTDUPTHREADS, "yes" },
   /*
    ** .pp
@@ -618,25 +536,6 @@ struct option_t MuttVars[] = {
    ** you must take care of space-stuffing <tt/From / lines (with a trailing
    ** space) yourself.
    */
-  {"envelope_from", DT_SYN, R_NONE, UL "use_envelope_from", 0 },
-  {"use_envelope_from", DT_BOOL, R_NONE, OPTENVFROM, "no" },
-  /*
-   ** .pp
-   ** When \fIset\fP, Madmutt will use ``$$envelope_from_address'' as the
-   ** \fIenvelope\fP sender if that is set, otherwise it will attempt to
-   ** derive it from the "From:" header.
-   **
-   ** .pp
-   ** \fBNote:\fP This information is passed
-   ** to sendmail command using the "-f" command line switch and
-   ** passed to the SMTP server for libESMTP (if support is compiled in).
-   */
-  {"envelope_from_address", DT_ADDR, R_NONE, UL &EnvFrom, "" },
-  /*
-  ** .pp
-  ** Manually sets the \fIenvelope\fP sender for outgoing messages.
-  ** This value is ignored if ``$$use_envelope_from'' is unset.
-  */
   {"fast_reply", DT_BOOL, R_NONE, OPTFASTREPLY, "no" },
   /*
    ** .pp
@@ -661,20 +560,6 @@ struct option_t MuttVars[] = {
    ** signed.
    ** (PGP only)
    */
-  {"file_charset", DT_STR, R_NONE, UL &FileCharset, "" },
-  /*
-   ** .pp
-   ** This variable is a colon-separated list of character encoding
-   ** schemes for text file attatchments.
-   ** If \fIunset\fP, $$charset value will be used instead.
-   ** For example, the following configuration would work for Japanese
-   ** text handling:
-   ** .pp
-   ** \fTset file_charset="iso-2022-jp:euc-jp:shift_jis:utf-8"\fP
-   ** .pp
-   ** Note: ``\fTiso-2022-*\fP'' must be put at the head of the value as shown above
-   ** if included.
-   */
   {"folder", DT_PATH, R_NONE, UL &Maildir, "~/Mail"},
   /*
    ** .pp
@@ -801,21 +686,6 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Defaults to the contents of the environment variable \fT$$$EMAIL\fP.
    */
-  {"gecos_mask", DT_RX, R_NONE, UL &GecosMask, "^[^,]*"},
-  /*
-   ** .pp
-   ** A regular expression used by Madmutt to parse the GECOS field of a password
-   ** entry when expanding the alias.  By default the regular expression is set
-   ** to ``\fT^[^,]*\fP'' which will return the string up to the first ``\fT,\fP'' encountered.
-   ** If the GECOS field contains a string like "lastname, firstname" then you
-   ** should do: \fTset gecos_mask=".*"\fP.
-   ** .pp
-   ** This can be useful if you see the following behavior: you address a e-mail
-   ** to user ID stevef whose full name is Steve Franklin.  If Madmutt expands
-   ** stevef to ``Franklin'' stevef@foo.bar then you should set the gecos_mask to
-   ** a regular expression that will match the whole name so Madmutt will expand
-   ** ``Franklin'' to ``Franklin, Steve''.
-   */
 #ifdef USE_NNTP
   {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, "%4C %M%N %5s  %-45.45f %d"},
   /*
@@ -921,15 +791,6 @@ struct option_t MuttVars[] = {
    ** This variable controls whether or not a \fTMail-Followup-To:\fP header field is
    ** honored when group-replying to a message.
    */
-  {"hostname", DT_STR, R_NONE, UL &Fqdn, "" },
-  /*
-   ** .pp
-   ** Specifies the hostname to use after the ``\fT@\fP'' in local e-mail
-   ** addresses and during generation of \fTMessage-ID:\fP headers.
-   ** .pp
-   ** Please be sure to really know what you are doing when changing this variable
-   ** to configure a custom domain part of Message-IDs.
-   */
   {"ignore_list_reply_to", DT_BOOL, R_NONE, OPTIGNORELISTREPLYTO, "no" },
   /*
    ** .pp
@@ -2329,7 +2190,6 @@ struct option_t MuttVars[] = {
    ** (S/MIME only)
    */
 #if defined(USE_LIBESMTP)
-  {"smtp_auth_username", DT_SYN, R_NONE, UL "smtp_user", 0},
   {"smtp_user", DT_STR, R_NONE, UL &SmtpAuthUser, "" },
   /*
    ** .pp
@@ -2339,7 +2199,6 @@ struct option_t MuttVars[] = {
    ** Defines the username to use with SMTP AUTH.  Setting this variable will
    ** cause Madmutt to attempt to use SMTP AUTH when sending.
    */
-  {"smtp_auth_password", DT_SYN, R_NONE, UL "smtp_pass", 0},
   {"smtp_pass", DT_STR, R_NONE, UL &SmtpAuthPass, "" },
   /*
    ** .pp
@@ -2354,7 +2213,6 @@ struct option_t MuttVars[] = {
    ** presents a security risk since the superuser of your machine may read it
    ** regardless of the file's permissions.
    */
-  {"smtp_envelope", DT_SYN, R_NONE, UL "envelope_from_address", 0 },
   {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, "" },
   /*
    ** .pp
@@ -2718,14 +2576,6 @@ struct option_t MuttVars[] = {
    ** with the query string the user types.  See ``$query'' for more
    ** information.
    */
-  {"quit", DT_QUAD, R_NONE, OPT_QUIT, "yes" },
-  /*
-   ** .pp
-   ** This variable controls whether ``quit'' and ``exit'' actually quit
-   ** from Madmutt.  If it set to \fIyes\fP, they do quit, if it is set to \fIno\fP, they
-   ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are
-   ** prompted for confirmation when you try to quit.
-   */
   {"quote_empty", DT_BOOL, R_NONE, OPTQUOTEEMPTY, "yes" },
   /*
    ** .pp
@@ -2932,34 +2782,6 @@ struct option_t MuttVars[] = {
    ** Madmutt scores are always greater than or equal to zero, the default setting
    ** of this variable will never mark a message read.
    */
-  {"send_charset", DT_STR, R_NONE, UL &SendCharset, "us-ascii:iso-8859-1:utf-8"},
-  /*
-   ** .pp
-   ** A list of character sets for outgoing messages. Madmutt will use the
-   ** first character set into which the text can be converted exactly.
-   ** If your ``$$charset'' is not \fTiso-8859-1\fP and recipients may not
-   ** understand \fTUTF-8\fP, it is advisable to include in the list an
-   ** appropriate widely used standard character set (such as
-   ** \fTiso-8859-2\fP, \fTkoi8-r\fP or \fTiso-2022-jp\fP) either
-   ** instead of or after \fTiso-8859-1\fP.
-   */
-  {"sendmail_wait", DT_NUM, R_NONE, UL &SendmailWait, "0" },
-  /*
-   ** .pp
-   ** Specifies the number of seconds to wait for the ``$$sendmail'' process
-   ** to finish before giving up and putting delivery in the background.
-   ** .pp
-   ** Madmutt interprets the value of this variable as follows:
-   ** .dl
-   ** .dt >0 .dd number of seconds to wait for sendmail to finish before continuing
-   ** .dt 0  .dd wait forever for sendmail to finish
-   ** .dt <0 .dd always put sendmail in the background without waiting
-   ** .de
-   ** .pp
-   ** Note that if you specify a value other than 0, the output of the child
-   ** process will be put in a temporary file.  If there is some error, you
-   ** will be informed as to where to find the output.
-   */
 #ifdef USE_NNTP
   {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, "no" },
   /*
@@ -3149,15 +2971,6 @@ struct option_t MuttVars[] = {
    ** Madmutt will attach the message whether or not this is the case,
    ** as long as the non-``$$reply_regexp'' parts of both messages are identical.
    */
-  {"spam_separator", DT_STR, R_NONE, UL &SpamSep, ","},
-  /*
-   ** .pp
-   ** ``$spam_separator'' controls what happens when multiple spam headers
-   ** are matched: if \fIunset\fP, each successive header will overwrite any
-   ** previous matches value for the spam label. If \fIset\fP, each successive
-   ** match will append to the previous, using ``$spam_separator'' as a
-   ** separator.
-   */
   {"spoolfile", DT_PATH, R_NONE, UL &Spoolfile, "" },
   /*
    ** .pp
@@ -3351,14 +3164,6 @@ struct option_t MuttVars[] = {
    ** checking for new mail.  A value of zero or less will cause Madmutt
    ** to never time out.
    */
-  {"tmpdir", DT_PATH, R_NONE, UL &Tempdir, "" },
-  /*
-   ** .pp
-   ** This variable allows you to specify where Madmutt will place its
-   ** temporary files needed for displaying and composing messages.  If
-   ** this variable is not set, the environment variable \fT$$$TMPDIR\fP is
-   ** used.  If \fT$$$TMPDIR\fP is not set then "\fT/tmp\fP" is used.
-   */
   {"to_chars", DT_STR, R_BOTH, UL &Tochars, " +TCFL"},
   /*
    ** .pp
@@ -3401,25 +3206,6 @@ struct option_t MuttVars[] = {
    ** This sets the umask that will be used by Madmutt when creating all
    ** kinds of files. If \fIunset\fP, the default value is \fT077\fP.
    */
-  {"use_8bitmime", DT_BOOL, R_NONE, OPTUSE8BITMIME, "no" },
-  /*
-   ** .pp
-   ** \fBWarning:\fP do not set this variable unless you are using a version
-   ** of sendmail which supports the \fT-B8BITMIME\fP flag (such as sendmail
-   ** 8.8.x) or in connection with the SMTP support via libESMTP.
-   ** Otherwise you may not be able to send mail.
-   ** .pp
-   ** When \fIset\fP, Madmutt will either invoke ``$$sendmail'' with the \fT-B8BITMIME\fP
-   ** flag when sending 8-bit messages to enable ESMTP negotiation or tell
-   ** libESMTP to do so.
-   */
-  {"use_domain", DT_BOOL, R_NONE, OPTUSEDOMAIN, "yes" },
-  /*
-   ** .pp
-   ** When \fIset\fP, Madmutt will qualify all local addresses (ones without the
-   ** @host portion) with the value of ``$$hostname''.  If \fIunset\fP, no
-   ** addresses will be qualified.
-   */
   {"use_from", DT_BOOL, R_NONE, OPTUSEFROM, "yes" },
   /*
    ** .pp
@@ -3555,8 +3341,6 @@ struct option_t MuttVars[] = {
    */
 #endif
   /*--*/
-  {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "no" },
-  {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, "yes"},
   { NULL, -1, R_NONE, -1, NULL }
 };
 
@@ -3622,7 +3406,6 @@ const struct mapping_t SortKeyMethods[] = {
 /* functions used to parse commands in a rc file */
 
 static int parse_list (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-static int parse_spam_list (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_attachments (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unattachments (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -3639,9 +3422,6 @@ static int parse_unmy_hdr (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_subscribe (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unsubscribe (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 
-static int parse_alternates (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-static int parse_unalternates (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-
 struct command_t {
     const char *name;
     int (*func) (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -3656,15 +3436,11 @@ struct command_t Commands[] = {
     {"exec",                mutt_parse_exec,       0},
     {"account-hook",        mutt_parse_hook,       M_ACCOUNTHOOK},
     {"append-hook",         mutt_parse_hook,       M_APPENDHOOK},
-    {"charset-hook",        mutt_parse_hook,       M_CHARSETHOOK},
     {"close-hook",          mutt_parse_hook,       M_CLOSEHOOK},
     {"crypt-hook",          mutt_parse_hook,       M_CRYPTHOOK},
     {"fcc-hook",            mutt_parse_hook,       M_FCCHOOK},
     {"fcc-save-hook",       mutt_parse_hook,       M_FCCHOOK|M_SAVEHOOK},
     {"folder-hook",         mutt_parse_hook,       M_FOLDERHOOK},
-#ifdef HAVE_ICONV
-    {"iconv-hook",          mutt_parse_hook,       M_ICONVHOOK},
-#endif
     {"mbox-hook",           mutt_parse_hook,       M_MBOXHOOK},
     {"message-hook",        mutt_parse_hook,       M_MESSAGEHOOK},
     {"open-hook",           mutt_parse_hook,       M_OPENHOOK},
@@ -3682,7 +3458,6 @@ struct command_t Commands[] = {
     {"unmono",              mutt_parse_unmono,     0},
     {"unscore",             mutt_parse_unscore,    0},
     {"alias",               parse_alias,           0},
-    {"alternates",          parse_alternates,      0},
     {"attachments",         parse_attachments,     0 },
     {"ignore",              parse_ignore,          0},
     {"alternative_order",   parse_list,            UL &AlternativeOrderList},
@@ -3696,11 +3471,8 @@ struct command_t Commands[] = {
     {"toggle",              parse_set,             M_SET_INV},
     {"unset",               parse_set,             M_SET_UNSET},
     {"source",              parse_source,          0},
-    {"nospam",              parse_spam_list,       M_NOSPAM},
-    {"spam",                parse_spam_list,       M_SPAM},
     {"subscribe",           parse_subscribe,       0},
     {"unalias",             parse_unalias,         0},
-    {"unalternates",        parse_unalternates,    0},
     {"unattachments",       parse_unattachments,   0},
     {"unignore",            parse_unignore,        0},
     {"unlists",             parse_unlists,         0},