X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=273b9df4a378b6b9ecc051d13472147f86504832;hp=de6c9dca6907150bcb2cf80ac5586149cddeb13a;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=7480539010bab6905c944b11b036492a1a625994 diff --git a/init.h b/init.h index de6c9dc..273b9df 100644 --- a/init.h +++ b/init.h @@ -18,56 +18,55 @@ #endif #include "buffy.h" +#include "mutt.h" +#include "version.h" #ifndef _MAKEDOC -#define DT_MASK 0x0f -#define DT_BOOL 1 /* boolean option */ -#define DT_NUM 2 /* a number */ -#define DT_STR 3 /* a string */ -#define DT_PATH 4 /* a pathname */ -#define DT_QUAD 5 /* quad-option (yes/no/ask-yes/ask-no) */ -#define DT_SORT 6 /* sorting methods */ -#define DT_RX 7 /* regular expressions */ -#define DT_MAGIC 8 /* mailbox type */ -#define DT_SYN 9 /* synonym for another variable */ -#define DT_ADDR 10 /* e-mail address */ +#define DT_MASK 0x0f +#define DT_BOOL 1 /* boolean option */ +#define DT_NUM 2 /* a number */ +#define DT_STR 3 /* a string */ +#define DT_PATH 4 /* a pathname */ +#define DT_QUAD 5 /* quad-option (yes/no/ask-yes/ask-no) */ +#define DT_SORT 6 /* sorting methods */ +#define DT_RX 7 /* regular expressions */ +#define DT_MAGIC 8 /* mailbox type */ +#define DT_SYN 9 /* synonym for another variable */ +#define DT_ADDR 10 /* e-mail address */ +#define DT_USER 11 /* user defined via $user_ */ +#define DT_SYS 12 /* pre-defined via $madmutt_ */ #define DTYPE(x) ((x) & DT_MASK) /* subtypes */ -#define DT_SUBTYPE_MASK 0xf0 -#define DT_SORT_ALIAS 0x10 +#define DT_SUBTYPE_MASK 0xf0 +#define DT_SORT_ALIAS 0x10 #define DT_SORT_BROWSER 0x20 -#define DT_SORT_KEYS 0x40 -#define DT_SORT_AUX 0x80 +#define DT_SORT_KEYS 0x40 +#define DT_SORT_AUX 0x80 /* flags to parse_set() */ -#define M_SET_INV (1<<0) /* default is to invert all vars */ -#define M_SET_UNSET (1<<1) /* default is to unset all vars */ -#define M_SET_RESET (1<<2) /* default is to reset all vars to default */ +#define M_SET_INV (1<<0) /* default is to invert all vars */ +#define M_SET_UNSET (1<<1) /* default is to unset all vars */ +#define M_SET_RESET (1<<2) /* default is to reset all vars to default */ /* forced redraw/resort types */ -#define R_NONE 0 -#define R_INDEX (1<<0) -#define R_PAGER (1<<1) -#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) +#define R_NONE 0 +#define R_INDEX (1<<0) +#define R_PAGER (1<<1) +#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 { - char *option; + const char *option; short type; short flags; unsigned long data; - unsigned long init; /* initial value */ -}; - -struct feature_t { - char *name; - short builtin; + const char *init; }; #define UL (unsigned long) @@ -81,21 +80,12 @@ struct feature_t { /* build complete documentation */ #ifdef _MAKEDOC -# ifndef USE_IMAP -# define USE_IMAP -# endif # ifndef MIXMASTER # define MIXMASTER "mixmaster" # endif -# ifndef USE_POP -# define USE_POP -# endif # ifndef USE_SSL # define USE_SSL # endif -# ifndef USE_SOCKET -# define USE_SOCKET -# endif # ifndef USE_LIBESMTP # define USE_LIBESMTP # endif @@ -105,12 +95,6 @@ struct feature_t { # ifndef USE_GNUTLS # define USE_GNUTLS # endif -# ifndef USE_DOTLOCK -# define USE_DOTLOCK -# endif -# ifndef DL_STANDALONE -# define DL_STANDALONE -# endif # ifndef USE_HCACHE # define USE_HCACHE # endif @@ -124,7 +108,25 @@ struct feature_t { struct option_t MuttVars[] = { /*++*/ - {"abort_nosubject", DT_QUAD, R_NONE, OPT_SUBJECT, M_ASKYES}, + {"abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, "no" }, + /* + ** .pp + ** This variable specifies whether to abort sending if no attachment + ** was made but the content references them, i.e. the content + ** matches the regular expression given in + ** $$attach_remind_regexp. If a match was found and this + ** variable is set to \fIyes\fP, message sending will be aborted + ** but the mail will be send nevertheless if set to \fIno\fP. + ** + ** .pp + ** This variable and $$attach_remind_regexp are intended to + ** remind the user to attach files if the message's text + ** references them. + ** + ** .pp + ** See also the $$attach_remind_regexp variable. + */ + {"abort_nosubject", DT_QUAD, R_NONE, OPT_SUBJECT, "ask-yes" }, /* ** .pp ** If set to \fIyes\fP, when composing messages and no subject is given @@ -132,7 +134,7 @@ struct option_t MuttVars[] = { ** \fIno\fP, composing messages with no subject given at the subject ** prompt will never be aborted. */ - {"abort_unmodified", DT_QUAD, R_NONE, OPT_ABORT, M_YES}, + {"abort_unmodified", DT_QUAD, R_NONE, OPT_ABORT, "yes" }, /* ** .pp ** If set to \fIyes\fP, composition will automatically abort after @@ -140,16 +142,16 @@ 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, UL "~/.muttngrc"}, + {"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 Mutt-ng will not automatically source this file; you must + ** \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, UL "%4n %2f %t %-10a %r"}, + {"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 @@ -163,13 +165,13 @@ struct option_t MuttVars[] = { ** .dt %t .dd character which indicates if the alias is tagged for inclusion ** .de */ - {"allow_8bit", DT_BOOL, R_NONE, OPTALLOW8BIT, 1}, + {"allow_8bit", DT_BOOL, R_NONE, OPTALLOW8BIT, "yes" }, /* ** .pp ** Controls whether 8-bit data is converted to 7-bit using either ** \fTquoted-printable\fP or \fTbase64\fP encoding when sending mail. */ - {"allow_ansi", DT_BOOL, R_NONE, OPTALLOWANSI, 0}, + {"allow_ansi", DT_BOOL, R_NONE, OPTALLOWANSI, "no" }, /* ** .pp ** Controls whether ANSI color codes in messages (and color tags in @@ -180,7 +182,7 @@ struct option_t MuttVars[] = { ** message could include a line like ``\fT[-- PGP output follows ...\fP" and ** give it the same color as your attachment color. */ - {"arrow_cursor", DT_BOOL, R_BOTH, OPTARROWCURSOR, 0}, + {"arrow_cursor", DT_BOOL, R_BOTH, OPTARROWCURSOR, "no" }, /* ** .pp ** When \fIset\fP, an arrow (``\fT->\fP'') will be used to indicate the current entry @@ -189,25 +191,25 @@ struct option_t MuttVars[] = { ** be redrawn on the screen when moving to the next or previous entries ** in the menu. */ - {"ascii_chars", DT_BOOL, R_BOTH, OPTASCIICHARS, 0}, + {"ascii_chars", DT_BOOL, R_BOTH, OPTASCIICHARS, "no" }, /* ** .pp - ** If \fIset\fP, Mutt-ng will use plain ASCII characters when displaying thread + ** If \fIset\fP, Madmutt will use plain ASCII characters when displaying thread ** and attachment trees, instead of the default \fTACS\fP characters. */ - {"askbcc", DT_BOOL, R_NONE, OPTASKBCC, 0}, + {"askbcc", DT_BOOL, R_NONE, OPTASKBCC, "no" }, /* ** .pp - ** If \fIset\fP, Mutt-ng will prompt you for blind-carbon-copy (Bcc) recipients + ** If \fIset\fP, Madmutt will prompt you for blind-carbon-copy (Bcc) recipients ** before editing an outgoing message. */ - {"askcc", DT_BOOL, R_NONE, OPTASKCC, 0}, + {"askcc", DT_BOOL, R_NONE, OPTASKCC, "no" }, /* ** .pp - ** If \fIset\fP, Mutt-ng will prompt you for carbon-copy (Cc) recipients before + ** 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, UL "us-ascii"}, + {"assumed_charset", DT_STR, R_NONE, UL &AssumedCharset, "us-ascii"}, /* ** .pp ** This variable is a colon-separated list of character encoding @@ -225,28 +227,26 @@ struct option_t MuttVars[] = { ** This variable is valid only if $$strict_mime is unset. */ #ifdef USE_NNTP - {"ask_followup_to", DT_SYN, R_NONE, UL "nntp_ask_followup_to", 0}, - {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, 0}, + {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, "no" }, /* ** .pp ** Availability: NNTP ** ** .pp - ** If \fIset\fP, Mutt-ng will prompt you for the \fTFollowup-To:\fP header + ** If \fIset\fP, Madmutt will prompt you for the \fTFollowup-To:\fP header ** field before editing the body of an outgoing news article. */ - {"ask_x_comment_to", DT_SYN, R_NONE, UL "nntp_ask_x_comment_to", 0}, - {"nntp_ask_x_comment_to", DT_BOOL, R_NONE, OPTASKXCOMMENTTO, 0}, + {"nntp_ask_x_comment_to", DT_BOOL, R_NONE, OPTASKXCOMMENTTO, "no" }, /* ** .pp ** Availability: NNTP ** ** .pp - ** If \fIset\fP, Mutt-ng will prompt you for the \fTX-Comment-To:\fP header + ** If \fIset\fP, Madmutt will prompt you for the \fTX-Comment-To:\fP header ** field before editing the body of an outgoing news article. */ #endif - {"attach_format", DT_STR, R_NONE, UL &AttachFormat, UL "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "}, + {"attach_format", DT_STR, R_NONE, UL &AttachFormat, "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "}, /* ** .pp ** This variable describes the format of the ``attachment'' menu. The @@ -263,47 +263,59 @@ struct option_t MuttVars[] = { ** .dt %m .dd major MIME type ** .dt %M .dd MIME subtype ** .dt %n .dd attachment number + ** .dt %Q .dd "Q", if MIME part qualifies for attachment counting ** .dt %s .dd size ** .dt %t .dd tagged flag ** .dt %T .dd graphic tree characters ** .dt %u .dd unlink (=to delete) flag + ** .dt %X .dd number of qualifying MIME parts in this part and its children ** .dt %>X .dd right justify the rest of the string and pad with character "X" ** .dt %|X .dd pad to the end of the line with character "X" ** .de */ - {"attach_sep", DT_STR, R_NONE, UL &AttachSep, UL "\n"}, + {"attach_remind_regexp", DT_RX, R_NONE, UL &AttachRemindRegexp, "attach"}, + /* + ** .pp + ** If this variable is non-empty, madmutt will scan a message's contents + ** before sending for this regular expression. If it is found, it will + ** ask for what to do depending on the setting of $$abort_noattach. + ** .pp + ** This variable and $$abort_noattach are intended to remind the user + ** to attach files if the message's text references them. + */ + {"attach_sep", DT_STR, R_NONE, UL &AttachSep, "\n"}, /* ** .pp ** The separator to add between attachments when operating (saving, ** printing, piping, etc) on a list of tagged attachments. */ - {"attach_split", DT_BOOL, R_NONE, OPTATTACHSPLIT, 1}, + {"attach_split", DT_BOOL, R_NONE, OPTATTACHSPLIT, "yes" }, /* ** .pp ** If this variable is \fIunset\fP, when operating (saving, printing, piping, - ** etc) on a list of tagged attachments, Mutt-ng will concatenate the + ** etc) on a list of tagged attachments, Madmutt will concatenate the ** attachments and will operate on them as a single attachment. The ** ``$$attach_sep'' separator is added after each attachment. When \fIset\fP, - ** Mutt-ng will operate on the attachments one by one. + ** Madmutt will operate on the attachments one by one. */ - {"attribution", DT_STR, R_NONE, UL &Attribution, UL "On %d, %n wrote:"}, + {"attribution", DT_STR, R_NONE, UL &Attribution, "On %d, %n wrote:"}, /* ** .pp ** This is the string that will precede a message which has been included ** in a reply. For a full listing of defined \fTprintf(3)\fP-like sequences see ** the section on ``$$index_format''. */ - {"autoedit", DT_BOOL, R_NONE, OPTAUTOEDIT, 0}, + {"autoedit", DT_BOOL, R_NONE, OPTAUTOEDIT, "no" }, /* ** .pp - ** When \fIset\fP along with ``$$edit_headers'', Mutt-ng will skip the initial + ** When \fIset\fP along with ``$$edit_headers'', Madmutt will skip the initial ** send-menu and allow you to immediately begin editing the body of your ** message. The send-menu may still be accessed once you have finished ** editing the body of your message. ** .pp ** Also see ``$$fast_reply''. */ - {"auto_tag", DT_BOOL, R_NONE, OPTAUTOTAG, 0}, + {"auto_tag", DT_BOOL, R_NONE, OPTAUTOTAG, "no" }, /* ** .pp ** When \fIset\fP, functions in the \fIindex\fP menu which affect a message @@ -311,19 +323,19 @@ 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, 1}, + {"beep", DT_BOOL, R_NONE, OPTBEEP, "yes" }, /* ** .pp - ** When this variable is \fIset\fP, Mutt-ng will beep when an error occurs. + ** When this variable is \fIset\fP, Madmutt will beep when an error occurs. */ - {"beep_new", DT_BOOL, R_NONE, OPTBEEPNEW, 0}, + {"beep_new", DT_BOOL, R_NONE, OPTBEEPNEW, "no" }, /* ** .pp - ** When this variable is \fIset\fP, Mutt-ng will beep whenever it prints a message + ** 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, M_ASKYES}, + {"bounce", DT_QUAD, R_NONE, OPT_BOUNCE, "ask-yes" }, /* ** .pp ** Controls whether you will be asked to confirm bouncing messages. @@ -331,14 +343,14 @@ struct option_t MuttVars[] = { ** message. Setting this variable to \fIno\fP is not generally useful, ** and thus not recommended, because you are unable to bounce messages. */ - {"bounce_delivered", DT_BOOL, R_NONE, OPTBOUNCEDELIVERED, 1}, + {"bounce_delivered", DT_BOOL, R_NONE, OPTBOUNCEDELIVERED, "yes" }, /* ** .pp - ** When this variable is \fIset\fP, Mutt-ng will include + ** When this variable is \fIset\fP, Madmutt will include ** \fTDelivered-To:\fP header fields when bouncing messages. ** Postfix users may wish to \fIunset\fP this variable. */ - { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 }, + { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, "no" }, /* ** .pp ** When this variable is set, mutt will place the cursor at the beginning @@ -348,47 +360,58 @@ struct option_t MuttVars[] = { ** visual terminals don't permit making the cursor invisible. */ #ifdef USE_NNTP - {"catchup_newsgroup", DT_SYN, R_NONE, UL "nntp_catchup", 0}, - {"nntp_catchup", DT_QUAD, R_NONE, OPT_CATCHUP, M_ASKYES}, + {"nntp_catchup", DT_QUAD, R_NONE, OPT_CATCHUP, "ask-yes" }, /* ** .pp ** Availability: NNTP ** ** .pp - ** If this variable is \fIset\fP, Mutt-ng will mark all articles in a newsgroup + ** If this variable is \fIset\fP, Madmutt will mark all articles in a newsgroup ** as read when you leaving it. */ #endif - {"charset", DT_STR, R_NONE, UL &Charset, UL 0}, + {"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, 1}, + {"check_new", DT_BOOL, R_NONE, OPTCHECKNEW, "yes" }, /* ** .pp ** \fBNote:\fP this option only affects \fImaildir\fP and \fIMH\fP style ** mailboxes. ** .pp - ** When \fIset\fP, Mutt-ng will check for new mail delivered while the + ** When \fIset\fP, Madmutt will check for new mail delivered while the ** mailbox is open. Especially with MH mailboxes, this operation can ** take quite some time since it involves scanning the directory and ** checking each file to see if it has already been looked at. If it's ** \fIunset\fP, no check for new mail is performed while the mailbox is open. */ - {"collapse_unread", DT_BOOL, R_NONE, OPTCOLLAPSEUNREAD, 1}, + {"collapse_unread", DT_BOOL, R_NONE, OPTCOLLAPSEUNREAD, "yes" }, /* ** .pp - ** When \fIunset\fP, Mutt-ng will not collapse a thread if it contains any + ** When \fIunset\fP, Madmutt will not collapse a thread if it contains any ** unread messages. */ - {"uncollapse_jump", DT_BOOL, R_NONE, OPTUNCOLLAPSEJUMP, 0}, + {"count_attachments", DT_BOOL, R_NONE, OPTCOUNTATTACH, "yes"}, /* ** .pp - ** When \fIset\fP, Mutt-ng will jump to the next unread message, if any, + ** This variable controls whether attachments should be counted for $$$index_format + ** and its \fT%X\fP expando or not. As for scoring, this variable can be used to + ** selectively turn counting on or off instead of removing and re-adding rules as + ** prefered because counting requires full loading of messages. + ** .pp + ** If it is \fIset\fP and rules were defined via the \fTattachments\fP and/or + ** \fTunattachments\fP commands, counting will be done. If it is \fIunset\fP no + ** counting will be done regardless whether rules were defined or not. + */ + {"uncollapse_jump", DT_BOOL, R_NONE, OPTUNCOLLAPSEJUMP, "no" }, + /* + ** .pp + ** When \fIset\fP, Madmutt will jump to the next unread message, if any, ** when the current thread is \fIun\fPcollapsed. */ - {"compose_format", DT_STR, R_BOTH, UL &ComposeFormat, UL "-- Mutt-ng: Compose [Approx. msg size: %l Atts: %a]%>-"}, + {"compose_format", DT_STR, R_BOTH, UL &ComposeFormat, "-- Madmutt: Compose [Approx. msg size: %l Atts: %a]%>-"}, /* ** .pp ** Controls the format of the status line displayed in the ``compose'' @@ -399,44 +422,44 @@ struct option_t MuttVars[] = { ** .dt %a .dd total number of attachments ** .dt %h .dd local hostname ** .dt %l .dd approximate size (in bytes) of the current message - ** .dt %v .dd Mutt-ng version string + ** .dt %v .dd Madmutt version string ** .de ** .pp ** See the text describing the ``$$status_format'' option for more ** information on how to set ``$$compose_format''. */ - {"config_charset", DT_STR, R_NONE, UL &ConfigCharset, UL 0}, + {"config_charset", DT_STR, R_NONE, UL &ConfigCharset, "" }, /* ** .pp - ** When defined, Mutt-ng will recode commands in rc files from this + ** When defined, Madmutt will recode commands in rc files from this ** encoding. */ - {"confirmappend", DT_BOOL, R_NONE, OPTCONFIRMAPPEND, 1}, + {"confirmappend", DT_BOOL, R_NONE, OPTCONFIRMAPPEND, "yes" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will prompt for confirmation when appending messages to + ** When \fIset\fP, Madmutt will prompt for confirmation when appending messages to ** an existing mailbox. */ - {"confirmcreate", DT_BOOL, R_NONE, OPTCONFIRMCREATE, 1}, + {"confirmcreate", DT_BOOL, R_NONE, OPTCONFIRMCREATE, "yes" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will prompt for confirmation when saving messages to a + ** When \fIset\fP, Madmutt will prompt for confirmation when saving messages to a ** mailbox which does not yet exist before creating it. */ - {"connect_timeout", DT_NUM, R_NONE, UL &ConnectTimeout, 30}, + {"connect_timeout", DT_NUM, R_NONE, UL &ConnectTimeout, "30" }, /* ** .pp - ** Causes Mutt-ng to timeout a network connection (for IMAP or POP) after this + ** Causes Madmutt to timeout a network connection (for IMAP or POP) after this ** many seconds if the connection is not able to be established. A negative - ** value causes Mutt-ng to wait indefinitely for the connection to succeed. + ** value causes Madmutt to wait indefinitely for the connection to succeed. */ - {"content_type", DT_STR, R_NONE, UL &ContentType, UL "text/plain"}, + {"content_type", DT_STR, R_NONE, UL &ContentType, "text/plain"}, /* ** .pp ** Sets the default \fTContent-Type:\fP header field for the body ** of newly composed messages. */ - {"copy", DT_QUAD, R_NONE, OPT_COPY, M_YES}, + {"copy", DT_QUAD, R_NONE, OPT_COPY, "yes" }, /* ** .pp ** This variable controls whether or not copies of your outgoing messages @@ -444,34 +467,34 @@ struct option_t MuttVars[] = { ** ``$$save_name'', ``$$force_name'' and ``$fcc-hook''. */ - {"crypt_use_gpgme", DT_BOOL, R_NONE, OPTCRYPTUSEGPGME, 0}, + {"crypt_use_gpgme", DT_BOOL, R_NONE, OPTCRYPTUSEGPGME, "no" }, /* ** .pp ** This variable controls the use the GPGME enabled crypto backends. - ** If it is \fIset\fP and Mutt-ng was build with gpgme support, the gpgme code for + ** If it is \fIset\fP and Madmutt was build with gpgme support, the gpgme code for ** S/MIME and PGP will be used instead of the classic code. ** .pp - ** \fBNote\fP: You need to use this option in your \fT.muttngrc\fP configuration + ** \fBNote\fP: You need to use this option in your \fT.madmuttrc\fP configuration ** file as it won't have any effect when used interactively. */ - {"crypt_autopgp", DT_BOOL, R_NONE, OPTCRYPTAUTOPGP, 1}, + {"crypt_autopgp", DT_BOOL, R_NONE, OPTCRYPTAUTOPGP, "yes" }, /* ** .pp - ** This variable controls whether or not Mutt-ng may automatically enable + ** This variable controls whether or not Madmutt may automatically enable ** PGP encryption/signing for messages. See also ``$$crypt_autoencrypt'', ** ``$$crypt_replyencrypt'', ** ``$$crypt_autosign'', ``$$crypt_replysign'' and ``$$smime_is_default''. */ - {"crypt_autosmime", DT_BOOL, R_NONE, OPTCRYPTAUTOSMIME, 1}, + {"crypt_autosmime", DT_BOOL, R_NONE, OPTCRYPTAUTOSMIME, "yes" }, /* ** .pp - ** This variable controls whether or not Mutt-ng may automatically enable + ** This variable controls whether or not Madmutt may automatically enable ** S/MIME encryption/signing for messages. See also ``$$crypt_autoencrypt'', ** ``$$crypt_replyencrypt'', ** ``$$crypt_autosign'', ``$$crypt_replysign'' and ``$$smime_is_default''. */ - {"date_format", DT_STR, R_BOTH, UL &DateFmt, UL "!%a, %b %d, %Y at %I:%M:%S%p %Z"}, + {"date_format", DT_STR, R_BOTH, UL &DateFmt, "!%a, %b %d, %Y at %I:%M:%S%p %Z"}, /* ** .pp ** This variable controls the format of the date printed by the ``\fT%d\fP'' @@ -485,7 +508,7 @@ struct option_t MuttVars[] = { ** rest of the string are expanded in the \fIC\fP locale (that is in US ** English). */ - {"default_hook", DT_STR, R_NONE, UL &DefaultHook, UL "~f %s !~P | (~P ~C %s)"}, + {"default_hook", DT_STR, R_NONE, UL &DefaultHook, "~f %s !~P | (~P ~C %s)"}, /* ** .pp ** This variable controls how send-hooks, message-hooks, save-hooks, @@ -499,7 +522,7 @@ struct option_t MuttVars[] = { ** ``alternates'') and is to or cc'ed to a user matching the given ** regular expression. */ - {"delete", DT_QUAD, R_NONE, OPT_DELETE, M_ASKYES}, + {"delete", DT_QUAD, R_NONE, OPT_DELETE, "ask-yes" }, /* ** .pp ** Controls whether or not messages are really deleted when closing or @@ -507,42 +530,50 @@ struct option_t MuttVars[] = { ** deleting will automatically be purged without prompting. If set to ** \fIno\fP, messages marked for deletion will be kept in the mailbox. */ - {"delete_untag", DT_BOOL, R_NONE, OPTDELETEUNTAG, 1}, + {"delete_space", DT_BOOL, R_NONE, OPTDELSP, "no" }, /* ** .pp - ** If this option is \fIset\fP, Mutt-ng will untag messages when marking them + ** When sending messages with \fTformat=flowed\fP by \fIsetting\fP the + ** $$text_flowed variable, this variable specifies whether to also + ** set the \fTDelSp\fP parameter to \fTyes\fP. If this is \fIunset\fP, + ** no additional parameter will be send as a value of \fTno\fP already + ** is the default behavior. + ** + ** .pp + ** \fBNote:\fP this variable only has an effect on \fIoutgoing\fP messages + ** (if $$text_flowed is \fIset\fP) but not on incomming. + */ + {"delete_untag", DT_BOOL, R_NONE, OPTDELETEUNTAG, "yes" }, + /* + ** .pp + ** If this option is \fIset\fP, Madmutt will untag messages when marking them ** for deletion. This applies when you either explicitly delete a message, ** or when you save it to another folder. */ - {"digest_collapse", DT_BOOL, R_NONE, OPTDIGESTCOLLAPSE, 1}, + {"digest_collapse", DT_BOOL, R_NONE, OPTDIGESTCOLLAPSE, "yes" }, /* ** .pp - ** If this option is \fIset\fP, Mutt-ng's received-attachments menu will not show the subparts of + ** If this option is \fIset\fP, Madmutt's received-attachments menu will not show the subparts of ** individual messages in a multipart/digest. To see these subparts, press 'v' on that menu. */ - {"display_filter", DT_PATH, R_PAGER, UL &DisplayFilter, UL ""}, + {"display_filter", DT_PATH, R_PAGER, UL &DisplayFilter, ""}, /* ** .pp ** When \fIset\fP, specifies a command used to filter messages. When a message ** is viewed it is passed as standard input to $$display_filter, and the ** filtered message is read from the standard output. */ -#if defined(DL_STANDALONE) && defined(USE_DOTLOCK) - {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, UL BINDIR "/muttng_dotlock"}, + {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$madmutt_bindir/muttng_dotlock"}, /* ** .pp - ** Availability: Standalone and Dotlock - ** - ** .pp - ** Contains the path of the \fTmuttng_dotlock(1)\fP binary to be used by - ** Mutt-ng. + ** Contains the path of the \fTmadmutt_dotlock(1)\fP binary to be used by + ** Madmutt. */ -#endif - {"dsn_notify", DT_STR, R_NONE, UL &DsnNotify, UL ""}, + {"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. + ** 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 @@ -553,11 +584,11 @@ struct option_t MuttVars[] = { ** .pp ** Example: \fTset dsn_notify="failure,delay"\fP */ - {"dsn_return", DT_STR, R_NONE, UL &DsnReturn, UL ""}, + {"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. + ** 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 @@ -565,51 +596,81 @@ struct option_t MuttVars[] = { ** .pp ** Example: \fTset dsn_return=hdrs\fP */ - {"duplicate_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTDUPTHREADS, 1}, + {"duplicate_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTDUPTHREADS, "yes" }, /* ** .pp - ** This variable controls whether Mutt-ng, when sorting by threads, threads - ** messages with the same \fTMessage-Id:\fP header field together. + ** This variable controls whether Madmutt, when sorting by threads, threads + ** messages with the same \fTMessage-ID:\fP header field together. ** If it is \fIset\fP, it will indicate that it thinks they are duplicates ** of each other with an equals sign in the thread diagram. */ - {"edit_headers", DT_BOOL, R_NONE, OPTEDITHDRS, 0}, + {"edit_headers", DT_BOOL, R_NONE, OPTEDITHDRS, "no" }, /* ** .pp ** This option allows you to edit the header of your outgoing messages ** along with the body of your message. + ** + ** .pp + ** Which empty header fields to show is controlled by the + ** $$editor_headers option. */ - {"editor", DT_PATH, R_NONE, UL &Editor, 0}, +#ifdef USE_NNTP + {"editor_headers", DT_STR, R_NONE, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To: Newsgroups: Followup-To: X-Comment-To:" }, +#else + {"editor_headers", DT_STR, R_NONE, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To:" }, +#endif /* ** .pp - ** This variable specifies which editor is used by Mutt-ng. + ** If $$edit_headers is \fIset\fP, this space-separated list specifies + ** which \fInon-empty\fP header fields to edit in addition to + ** user-defined headers. + ** + ** .pp + ** Note: if $$edit_headers had to be turned on by force because + ** $$strict_mailto is \fIunset\fP, this option has no effect. + */ + {"editor", DT_PATH, R_NONE, UL &Editor, "" }, + /* + ** .pp + ** This variable specifies which editor is used by Madmutt. ** It defaults to the value of the \fT$$$VISUAL\fP, or \fT$$$EDITOR\fP, environment ** variable, or to the string "\fTvi\fP" if neither of those are set. */ - {"encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, 0}, + {"encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, "no" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will \fTquoted-printable\fP encode messages when + ** When \fIset\fP, Madmutt will \fTquoted-printable\fP encode messages when ** they contain the string ``\fTFrom \fP'' (note the trailing space) ** in the beginning of a line. Useful to avoid the tampering certain mail ** delivery and transport agents tend to do with messages. - */ - {"envelope_from", DT_BOOL, R_NONE, OPTENVFROM, 0}, - /* + ** ** .pp - ** When \fIset\fP, Mutt-ng will try to derive the message's \fIenvelope\fP - ** sender from the ``\fTFrom:\fP'' header field. Note that this information is passed - ** to the sendmail command using the ``\fT-f\fP" command line switch, so don't set this - ** option if you are using that switch in $$sendmail yourself, - ** or if the sendmail on your machine doesn't support that command - ** line switch. + ** \fBNote:\fP as Madmutt currently violates RfC3676 defining + ** \fTformat=flowed\fP, it's '\fP - ** when replying to the mutt-ng developer's mailing list and Mutt-ng takes this email address. + ** \fTsend-hook Madmutt-devel@lists.berlios.de 'my_hdr From: Foo Bar '\fP + ** when replying to the Madmutt developer's mailing list and Madmutt takes this email address. ** .pp ** Defaults to the contents of the environment variable \fT$$$EMAIL\fP. */ - {"gecos_mask", DT_RX, R_NONE, UL &GecosMask, UL "^[^,]*"}, + {"gecos_mask", DT_RX, R_NONE, UL &GecosMask, "^[^,]*"}, /* ** .pp - ** A regular expression used by Mutt-ng to parse the GECOS field of a password + ** 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 Mutt-ng expands + ** 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 Mutt-ng will expand + ** a regular expression that will match the whole name so Madmutt will expand ** ``Franklin'' to ``Franklin, Steve''. */ #ifdef USE_NNTP - {"group_index_format", DT_SYN, R_NONE, UL "nntp_group_index_format", 0}, - {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, UL "%4C %M%N %5s %-45.45f %d"}, + {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, "%4C %M%N %5s %-45.45f %d"}, /* ** .pp ** Availability: NNTP @@ -814,7 +873,7 @@ struct option_t MuttVars[] = { ** .te */ #endif - {"hdrs", DT_BOOL, R_NONE, OPTHDRS, 1}, + {"hdrs", DT_BOOL, R_NONE, OPTHDRS, "yes" }, /* ** .pp ** When \fIunset\fP, the header fields normally added by the ``$my_hdr'' @@ -822,14 +881,14 @@ struct option_t MuttVars[] = { ** composing a new message or replying in order to take effect. If \fIset\fP, ** the user defined header fields are added to every new message. */ - {"header", DT_BOOL, R_NONE, OPTHEADER, 0}, + {"header", DT_BOOL, R_NONE, OPTHEADER, "no" }, /* ** .pp - ** When \fIset\fP, this variable causes Mutt-ng to include the header + ** When \fIset\fP, this variable causes Madmutt to include the header ** of the message you are replying to into the edit buffer. ** The ``$$weed'' setting applies. */ - {"help", DT_BOOL, R_BOTH, OPTHELP, 1}, + {"help", DT_BOOL, R_BOTH, OPTHELP, "yes" }, /* ** .pp ** When \fIset\fP, help lines describing the bindings for the major functions @@ -837,136 +896,124 @@ struct option_t MuttVars[] = { ** .pp ** \fBNote:\fP The binding will not be displayed correctly if the ** function is bound to a sequence rather than a single keystroke. Also, - ** the help line may not be updated if a binding is changed while Mutt-ng is + ** the help line may not be updated if a binding is changed while Madmutt is ** running. Since this variable is primarily aimed at new users, neither ** of these should present a major problem. */ - {"hidden_host", DT_BOOL, R_NONE, OPTHIDDENHOST, 0}, + {"hidden_host", DT_BOOL, R_NONE, OPTHIDDENHOST, "no" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will skip the host name part of ``$$hostname'' variable + ** When \fIset\fP, Madmutt will skip the host name part of ``$$hostname'' variable ** when adding the domain part to addresses. This variable does not ** affect the generation of \fTMessage-ID:\fP header fields, and it will not lead to the ** cut-off of first-level domains. */ - {"hide_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDELIMITED, 0}, + {"hide_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDELIMITED, "no" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will not show the presence of messages that are hidden + ** When \fIset\fP, Madmutt will not show the presence of messages that are hidden ** by limiting, in the thread tree. */ - {"hide_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDEMISSING, 1}, + {"hide_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDEMISSING, "yes" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will not show the presence of missing messages in the + ** When \fIset\fP, Madmutt will not show the presence of missing messages in the ** thread tree. */ - {"hide_thread_subject", DT_BOOL, R_TREE|R_INDEX, OPTHIDETHREADSUBJECT, 1}, + {"hide_thread_subject", DT_BOOL, R_TREE|R_INDEX, OPTHIDETHREADSUBJECT, "yes" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will not show the subject of messages in the thread + ** When \fIset\fP, Madmutt will not show the subject of messages in the thread ** tree that have the same subject as their parent or closest previously ** displayed sibling. */ - {"hide_top_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPLIMITED, 0}, + {"hide_top_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPLIMITED, "no" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will not show the presence of messages that are hidden + ** When \fIset\fP, Madmutt will not show the presence of messages that are hidden ** by limiting, at the top of threads in the thread tree. Note that when - ** $$hide_missing is set, this option will have no effect. + ** $$hide_missing is \fIset\fP, this option will have no effect. */ - {"hide_top_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPMISSING, 1}, + {"hide_top_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPMISSING, "yes" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will not show the presence of missing messages at the + ** When \fIset\fP, Madmutt will not show the presence of missing messages at the ** top of threads in the thread tree. Note that when $$hide_limited is ** \fIset\fP, this option will have no effect. */ - {"history", DT_NUM, R_NONE, UL &HistSize, 10}, + {"history", DT_NUM, R_NONE, UL &HistSize, "10" }, /* ** .pp ** This variable controls the size (in number of strings remembered) of ** the string history buffer. The buffer is cleared each time the ** variable is changed. */ - {"honor_followup_to", DT_QUAD, R_NONE, OPT_MFUPTO, M_YES}, + {"honor_followup_to", DT_QUAD, R_NONE, OPT_MFUPTO, "yes" }, /* ** .pp ** 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, 0}, + {"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. + ** 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, 0}, + {"ignore_list_reply_to", DT_BOOL, R_NONE, OPTIGNORELISTREPLYTO, "no" }, /* ** .pp ** Affects the behaviour of the \fIreply\fP function when replying to ** messages from mailing lists. When \fIset\fP, if the ``\fTReply-To:\fP'' header field is - ** set to the same value as the ``\fTTo:\fP'' header field, Mutt-ng assumes that the + ** set to the same value as the ``\fTTo:\fP'' header field, Madmutt assumes that the ** ``\fTReply-To:\fP'' header field was set by the mailing list to automate responses ** to the list, and will ignore this field. To direct a response to the ** mailing list when this option is set, use the \fIlist-reply\fP ** function; \fIgroup-reply\fP will reply to both the sender and the ** list. + ** Remember: This option works only for mailing lists which are explicitly set in your madmuttrc + ** configuration file. */ -#ifdef USE_IMAP - {"imap_authenticators", DT_STR, R_NONE, UL &ImapAuthenticators, UL 0}, + {"imap_authenticators", DT_STR, R_NONE, UL &ImapAuthenticators, "" }, /* ** .pp - ** Availability: IMAP - ** - ** .pp - ** This is a colon-delimited list of authentication methods Mutt-ng may - ** attempt to use to log in to an IMAP server, in the order Mutt-ng should + ** This is a colon-delimited list of authentication methods Madmutt may + ** attempt to use to log in to an IMAP server, in the order Madmutt should ** try them. Authentication methods are either ``\fTlogin\fP'' or the right ** side of an IMAP ``\fTAUTH=\fP'' capability string, e.g. ``\fTdigest-md5\fP'', ** ``\fTgssapi\fP'' or ``\fTcram-md5\fP''. This parameter is case-insensitive. ** .pp ** If this - ** parameter is \fIunset\fP (the default) Mutt-ng will try all available methods, + ** parameter is \fIunset\fP (the default) Madmutt will try all available methods, ** in order from most-secure to least-secure. ** .pp ** Example: \fTset imap_authenticators="gssapi:cram-md5:login"\fP ** .pp - ** \fBNote:\fP Mutt-ng will only fall back to other authentication methods if + ** \fBNote:\fP Madmutt will only fall back to other authentication methods if ** the previous methods are unavailable. If a method is available but - ** authentication fails, Mutt-ng will not connect to the IMAP server. + ** authentication fails, Madmutt will not connect to the IMAP server. */ - {"imap_delim_chars", DT_STR, R_NONE, UL &ImapDelimChars, UL "/."}, + { "imap_check_subscribed", DT_BOOL, R_NONE, OPTIMAPCHECKSUBSCRIBED, "no" }, /* ** .pp - ** Availability: IMAP - ** + ** When \fIset\fP, mutt will fetch the set of subscribed folders from + ** your server on connection, and add them to the set of mailboxes + ** it polls for new mail. See also the ``$mailboxes'' command. + */ + {"imap_delim_chars", DT_STR, R_NONE, UL &ImapDelimChars, "/."}, + /* ** .pp ** This contains the list of characters which you would like to treat ** as folder separators for displaying IMAP paths. In particular it ** helps in using the '\fT=\fP' shortcut for your $$folder variable. */ -# if defined(USE_SSL) || defined(USE_GNUTLS) - {"imap_force_ssl", DT_BOOL, R_NONE, OPTIMAPFORCESSL, 0}, + {"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, "" }, /* ** .pp - ** Availability: IMAP and SSL or IMAP and GNUTLS - ** - ** .pp - ** If this variable is \fIset\fP, Mutt-ng will always use SSL when - ** connecting to IMAP servers. - */ -# endif - {"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, UL 0}, - /* - ** .pp - ** Availability: IMAP - ** - ** .pp - ** Mutt-ng requests these header fields in addition to the default headers + ** Madmutt requests these header fields in addition to the default headers ** (``DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE ** CONTENT-DESCRIPTION IN-REPLY-TO REPLY-TO LINES X-LABEL'') from IMAP ** servers before displaying the ``index'' menu. You may want to add more @@ -974,25 +1021,19 @@ struct option_t MuttVars[] = { ** .pp ** \fBNote:\fP This is a space separated list. */ - {"imap_home_namespace", DT_STR, R_NONE, UL &ImapHomeNamespace, UL 0}, + {"imap_home_namespace", DT_STR, R_NONE, UL &ImapHomeNamespace, "" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** You normally want to see your personal folders alongside ** your \fTINBOX\fP in the IMAP browser. If you see something else, you may set ** this variable to the IMAP path to your folders. */ - {"imap_keepalive", DT_NUM, R_NONE, UL &ImapKeepalive, 900}, + {"imap_keepalive", DT_NUM, R_NONE, UL &ImapKeepalive, "900" }, /* ** .pp - ** Availability: IMAP - ** - ** .pp - ** This variable specifies the maximum amount of time in seconds that Mutt-ng + ** This variable specifies the maximum amount of time in seconds that Madmutt ** will wait before polling open IMAP connections, to prevent the server - ** from closing them before Mutt-ng has finished with them. + ** from closing them before Madmutt has finished with them. ** .pp ** The default is ** well within the RFC-specified minimum amount of time (30 minutes) before @@ -1002,131 +1043,106 @@ struct option_t MuttVars[] = { ** Reduce this number if you find yourself ** getting disconnected from your IMAP server due to inactivity. */ - {"imap_login", DT_STR, R_NONE, UL &ImapLogin, 0 }, + {"imap_login", DT_STR, R_NONE, UL &ImapLogin, "" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** Your login name on the IMAP server. ** .pp ** This variable defaults to the value of ``$$imap_user.'' */ - {"imap_list_subscribed", DT_BOOL, R_NONE, OPTIMAPLSUB, 0}, + {"imap_list_subscribed", DT_BOOL, R_NONE, OPTIMAPLSUB, "no" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** This variable configures whether IMAP folder browsing will look for ** only subscribed folders or all folders. This can be toggled in the ** IMAP browser with the \fItoggle-subscribed\fP function. */ - {"imap_mail_check", DT_NUM, R_NONE, UL &ImapBuffyTimeout, 300}, + {"imap_mail_check", DT_NUM, R_NONE, UL &ImapBuffyTimeout, "300" }, /* ** .pp - ** This variable configures how often (in seconds) Mutt-ng should look for + ** This variable configures how often (in seconds) Madmutt should look for ** new mail in IMAP folders. This is split from the ``$mail_check'' variable ** to generate less traffic and get more accurate information for local folders. */ - {"imap_pass", DT_STR, R_NONE, UL &ImapPass, UL 0}, + {"imap_pass", DT_STR, R_NONE, UL &ImapPass, "" }, /* ** .pp - ** Availability: IMAP - ** - ** .pp - ** Specifies the password for your IMAP account. If \fIunset\fP, Mutt-ng will + ** Specifies the password for your IMAP account. If \fIunset\fP, Madmutt will ** prompt you for your password when you invoke the fetch-mail function. ** .pp ** \fBWarning\fP: you should only use this option when you are on a ** fairly secure machine, because the superuser can read your configuration even ** if you are the only one who can read the file. */ - {"imap_passive", DT_BOOL, R_NONE, OPTIMAPPASSIVE, 1}, + {"imap_passive", DT_BOOL, R_NONE, OPTIMAPPASSIVE, "yes" }, /* ** .pp - ** Availability: IMAP - ** - ** .pp - ** When \fIset\fP, Mutt-ng will not open new IMAP connections to check for new - ** mail. Mutt-ng will only check for new mail over existing IMAP + ** When \fIset\fP, Madmutt will not open new IMAP connections to check for new + ** mail. Madmutt will only check for new mail over existing IMAP ** connections. This is useful if you don't want to be prompted to - ** user/password pairs on Mutt-ng invocation, or if opening the connection + ** user/password pairs on Madmutt invocation, or if opening the connection ** is slow. */ - {"imap_peek", DT_BOOL, R_NONE, OPTIMAPPEEK, 1}, + {"imap_peek", DT_BOOL, R_NONE, OPTIMAPPEEK, "yes" }, /* ** .pp - ** Availability: IMAP - ** - ** .pp - ** If \fIset\fP, Mutt-ng will avoid implicitly marking your mail as read whenever + ** If \fIset\fP, Madmutt will avoid implicitly marking your mail as read whenever ** you fetch a message from the server. This is generally a good thing, ** but can make closing an IMAP folder somewhat slower. This option ** exists to appease speed freaks. */ - {"imap_reconnect", DT_QUAD, R_NONE, OPT_IMAPRECONNECT, M_ASKYES}, + {"imap_reconnect", DT_QUAD, R_NONE, OPT_IMAPRECONNECT, "ask-yes" }, /* ** .pp - ** Availability: IMAP - ** - ** .pp - ** Controls whether or not Mutt-ng will try to reconnect to IMAP server when + ** Controls whether or not Madmutt will try to reconnect to IMAP server when ** the connection is lost. */ - {"imap_servernoise", DT_BOOL, R_NONE, OPTIMAPSERVERNOISE, 1}, + {"imap_servernoise", DT_BOOL, R_NONE, OPTIMAPSERVERNOISE, "yes" }, /* ** .pp - ** Availability: IMAP - ** - ** .pp - ** When \fIset\fP, Mutt-ng will display warning messages from the IMAP + ** When \fIset\fP, Madmutt will display warning messages from the IMAP ** server as error messages. Since these messages are often ** harmless, or generated due to configuration problems on the ** server which are out of the users' hands, you may wish to suppress ** them at some point. */ - {"imap_user", DT_STR, R_NONE, UL &ImapUser, UL 0}, + {"imap_user", DT_STR, R_NONE, UL &ImapUser, "" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** The name of the user whose mail you intend to access on the IMAP ** server. ** .pp ** This variable defaults to your user name on the local machine. */ -#endif - {"implicit_autoview", DT_BOOL, R_NONE, OPTIMPLICITAUTOVIEW, 0}, + {"implicit_autoview", DT_BOOL, R_NONE, OPTIMPLICITAUTOVIEW, "no" }, /* ** .pp - ** If \fIset\fP, Mutt-ng will look for a mailcap entry with the + ** If \fIset\fP, Madmutt will look for a mailcap entry with the ** ``\fTcopiousoutput\fP'' flag set for \fIevery\fP MIME attachment it doesn't have - ** an internal viewer defined for. If such an entry is found, Mutt-ng will + ** an internal viewer defined for. If such an entry is found, Madmutt will ** use the viewer defined in that entry to convert the body part to text ** form. */ - {"include", DT_QUAD, R_NONE, OPT_INCLUDE, M_ASKYES}, + {"include", DT_QUAD, R_NONE, OPT_INCLUDE, "ask-yes" }, /* ** .pp ** 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}, + {"include_onlyfirst", DT_BOOL, R_NONE, OPTINCLUDEONLYFIRST, "no" }, /* ** .pp - ** Controls whether or not Mutt-ng includes only the first attachment + ** Controls whether or not Madmutt includes only the first attachment ** of the message you are replying. */ - {"indent_string", DT_STR, R_NONE, UL &Prefix, UL "> "}, + {"indent_string", DT_STR, R_NONE, UL &Prefix, "> "}, /* ** .pp ** Specifies the string to prepend to each line of text quoted in a ** message to which you are replying. You are strongly encouraged not to ** change this value, as it tends to agitate the more fanatical netizens. */ - {"index_format", DT_STR, R_BOTH, UL &HdrFmt, UL "%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"}, + {"index_format", DT_STR, R_BOTH, UL &HdrFmt, "%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"}, /* ** .pp ** This variable allows you to customize the message index display to @@ -1134,7 +1150,7 @@ struct option_t MuttVars[] = { ** .pp ** ``Format strings'' are similar to the strings used in the ``C'' ** function \fTprintf(3)\fP to format output (see the man page for more detail). - ** The following sequences are defined in Mutt-ng: + ** The following sequences are defined in Madmutt: ** .pp ** .dl ** .dt %a .dd address of the author @@ -1163,7 +1179,7 @@ struct option_t MuttVars[] = { ** .dt %M .dd number of hidden messages if the thread is collapsed. ** .dt %N .dd message score ** .dt %n .dd author's real name (or address if missing) - ** .dt %O .dd (_O_riginal save folder) Where Mutt-ng would formerly have + ** .dt %O .dd (_O_riginal save folder) Where Madmutt would formerly have ** stashed the message: list name or recipient name if no list ** .dt %s .dd subject of the message ** .dt %S .dd status of the message (N/D/d/!/r/\(as) @@ -1172,6 +1188,7 @@ struct option_t MuttVars[] = { ** .dt %u .dd user (login) name of the author ** .dt %v .dd first name of the author, or the recipient if the message is from you ** .dt %W .dd name of organization of author (`organization:' field) + ** .dt %X .dd number of attachments ** .dt %y .dd `x-label:' field, if present ** .dt %Y .dd `x-label' field, if present, and (1) not at part of a thread tree, ** (2) at the top of a thread, or (3) `x-label' is different from @@ -1195,15 +1212,14 @@ struct option_t MuttVars[] = { ** See also: ``$$to_chars''. */ #ifdef USE_NNTP - {"inews", DT_SYN, R_NONE, UL "nntp_inews", 0}, - {"nntp_inews", DT_PATH, R_NONE, UL &Inews, UL ""}, + {"nntp_inews", DT_PATH, R_NONE, UL &Inews, ""}, /* ** .pp ** Availability: NNTP ** ** .pp ** If \fIset\fP, specifies the program and arguments used to deliver news posted - ** by Mutt-ng. Otherwise, Mutt-ng posts article using current connection. + ** by Madmutt. Otherwise, Madmutt posts article using current connection. ** The following \fTprintf(3)\fP-style sequence is understood: ** .pp ** .ts @@ -1213,65 +1229,73 @@ struct option_t MuttVars[] = { ** Example: \fTset inews="/usr/local/bin/inews -hS"\fP */ #endif - {"ispell", DT_PATH, R_NONE, UL &Ispell, UL ISPELL}, + {"ispell", DT_PATH, R_NONE, UL &Ispell, ISPELL}, /* ** .pp ** How to invoke ispell (GNU's spell-checking software). */ - {"keep_flagged", DT_BOOL, R_NONE, OPTKEEPFLAGGED, 0}, + {"keep_flagged", DT_BOOL, R_NONE, OPTKEEPFLAGGED, "no" }, /* ** .pp ** If \fIset\fP, read messages marked as flagged will not be moved ** from your spool mailbox to your ``$$mbox'' mailbox, or as a result of ** a ``$mbox-hook'' command. */ - {"locale", DT_STR, R_BOTH, UL &Locale, UL "C"}, + {"locale", DT_STR, R_BOTH, UL &Locale, "C"}, /* ** .pp ** The locale used by \fTstrftime(3)\fP to format dates. Legal values are ** the strings your system accepts for the locale variable \fTLC_TIME\fP. */ - {"list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, M_NO}, + {"force_list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, "ask-no" }, /* ** .pp - ** When \fIset\fP, address replies to the mailing list the original message came - ** from (instead to the author only). Setting this option to ``\fIask-yes\fP'' or - ** ``\fIask-no\fP'' will ask if you really intended to reply to the author only. + ** This variable controls what effect ordinary replies have on mailing list + ** messages: if \fIset\fP, a normal reply will be interpreted as list-reply + ** while if it's \fIunset\fP the reply functions work as usual. */ - {"max_line_length", DT_NUM, R_NONE, UL &MaxLineLength, 0}, + {"max_display_recips", DT_NUM, R_PAGER, UL &MaxDispRecips, "0" }, + /* + ** .pp + ** When set non-zero, this specifies the maximum number of recipient header + ** lines (\fTTo:\fP, \fTCc:\fP and \fTBcc:\fP) to display in the pager if header + ** weeding is turned on. In case the number of lines exeeds its value, the + ** last line will have 3 dots appended. + */ + {"max_line_length", DT_NUM, R_PAGER, UL &MaxLineLength, "0" }, /* ** .pp ** When \fIset\fP, the maximum line length for displaying ``format = flowed'' messages is limited ** to this length. A value of 0 (which is also the default) means that the ** maximum line length is determined by the terminal width and $$wrapmargin. */ - {"mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, 5}, + {"mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, "5" }, /* ** .pp - ** This variable configures how often (in seconds) Mutt-ng should look for + ** This variable configures how often (in seconds) Madmutt should look for ** new mail. ** .pp ** \fBNote:\fP This does not apply to IMAP mailboxes, see $$imap_mail_check. */ - {"mailcap_path", DT_STR, R_NONE, UL &MailcapPath, 0}, + {"mailcap_path", DT_STR, R_NONE, UL &MailcapPath, "" }, /* ** .pp ** This variable specifies which files to consult when attempting to - ** display MIME bodies not directly supported by Mutt-ng. + ** display MIME bodies not directly supported by Madmutt. */ - {"mailcap_sanitize", DT_BOOL, R_NONE, OPTMAILCAPSANITIZE, 1}, + {"mailcap_sanitize", DT_BOOL, R_NONE, OPTMAILCAPSANITIZE, "yes" }, /* ** .pp - ** If \fIset\fP, Mutt-ng will restrict possible characters in mailcap \fT%\fP expandos + ** If \fIset\fP, Madmutt will restrict possible characters in mailcap \fT%\fP expandos ** to a well-defined set of safe characters. This is the safe setting, ** but we are not sure it doesn't break some more advanced MIME stuff. ** .pp ** \fBDON'T CHANGE THIS SETTING UNLESS YOU ARE REALLY SURE WHAT YOU ARE ** DOING!\fP */ -#if USE_HCACHE +#ifdef USE_HCACHE - {"header_cache", DT_PATH, R_NONE, UL &HeaderCache, 0}, + {"header_cache", DT_PATH, R_NONE, UL &HeaderCache, "" }, /* ** .pp ** Availability: Header Cache @@ -1284,18 +1308,18 @@ struct option_t MuttVars[] = { ** be a single global header cache. By default it is \fIunset\fP so no ** header caching will be used. */ - {"maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, 1}, + {"maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, "yes" }, /* ** .pp ** Availability: Header Cache ** ** .pp - ** Check for Maildir unaware programs other than Mutt-ng having modified maildir + ** Check for Maildir unaware programs other than Madmutt having modified maildir ** files when the header cache is in use. This incurs one \fTstat(2)\fP per ** message every time the folder is opened. */ -#if HAVE_GDBM || HAVE_DB4 - {"header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384"}, +#if defined(HAVE_GDBM) || defined(HAVE_DB4) + {"header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, "16384"}, /* ** .pp ** Availability: Header Cache @@ -1310,8 +1334,8 @@ struct option_t MuttVars[] = { ** cache (first hit). */ #endif /* HAVE_GDBM || HAVE_DB 4 */ -#if HAVE_QDBM - { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, 0 }, +#ifdef HAVE_QDBM + { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, "no" }, /* ** .pp ** If enabled the header cache will be compressed. So only one fifth of the usual @@ -1320,7 +1344,7 @@ struct option_t MuttVars[] = { */ #endif /* HAVE_QDBM */ #endif /* USE_HCACHE */ - {"maildir_trash", DT_BOOL, R_NONE, OPTMAILDIRTRASH, 0}, + {"maildir_trash", DT_BOOL, R_NONE, OPTMAILDIRTRASH, "no" }, /* ** .pp ** If \fIset\fP, messages marked as deleted will be saved with the maildir @@ -1332,80 +1356,159 @@ struct option_t MuttVars[] = { ** .pp ** It is similiar to the trash option. */ - {"mark_old", DT_BOOL, R_BOTH, OPTMARKOLD, 1}, + {"mark_old", DT_BOOL, R_BOTH, OPTMARKOLD, "yes" }, /* ** .pp - ** Controls whether or not Mutt-ng marks \fInew\fP \fBunread\fP + ** Controls whether or not Madmutt marks \fInew\fP \fBunread\fP ** messages as \fIold\fP if you exit a mailbox without reading them. ** .pp - ** With this option \fIset\fP, the next time you start Mutt-ng, the messages + ** With this option \fIset\fP, the next time you start Madmutt, the messages ** will show up with an "O" next to them in the ``index'' menu, ** indicating that they are old. */ - {"markers", DT_BOOL, R_PAGER, OPTMARKERS, 1}, + {"markers", DT_BOOL, R_PAGER, OPTMARKERS, "yes" }, /* ** .pp ** Controls the display of wrapped lines in the internal pager. If set, a ** ``\fT+\fP'' marker is displayed at the beginning of wrapped lines. Also see ** the ``$$smart_wrap'' variable. */ - {"mask", DT_RX, R_NONE, UL &Mask, UL "!^\\.[^.]"}, + {"mask", DT_RX, R_NONE, UL &Mask, "!^\\.[^.]"}, /* ** .pp ** A regular expression used in the file browser, optionally preceded by ** the \fInot\fP operator ``\fT!\fP''. Only files whose names match this mask ** will be shown. The match is always case-sensitive. */ - {"mbox", DT_PATH, R_BOTH, UL &Inbox, UL "~/mbox"}, + {"mbox", DT_PATH, R_BOTH, UL &Inbox, "~/mbox"}, /* ** .pp ** This specifies the folder into which read mail in your ``$$spoolfile'' ** folder will be appended. */ - {"operating_system", DT_STR, R_NONE, UL &OperatingSystem, 0}, + {"madmutt_version", DT_SYS, R_NONE, 0, VERSION }, + /* + ** .pp + ** \fIThis is a read-only system property and specifies madmutt's + ** version string.\fP + */ + {"madmutt_revision", DT_SYS, R_NONE, 0, MUTT_REVISION }, + /* + ** .pp + ** \fIThis is a read-only system property and specifies madmutt's + ** subversion revision string.\fP + */ + {"madmutt_sysconfdir", DT_SYS, R_NONE, 0, SYSCONFDIR }, + /* + ** .pp + ** \fIThis is a read-only system property and specifies the + ** directory containing the madmutt system-wide configuration.\fP + */ + {"madmutt_bindir", DT_SYS, R_NONE, 0, BINDIR }, + /* + ** .pp + ** \fIThis is a read-only system property and specifies the + ** directory containing the madmutt binary.\fP + */ + {"madmutt_docdir", DT_SYS, R_NONE, 0, PKGDOCDIR }, + /* + ** .pp + ** \fIThis is a read-only system property and specifies the + ** directory containing the madmutt documentation.\fP + */ +#ifdef USE_HCACHE +#if defined(HAVE_QDBM) + {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "qdbm" }, +#elif defined(HAVE_GDBM) + {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "gdbm" }, +#elif defined(HAVE_DB4) + {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "db4" }, +#else + {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "unknown" }, +#endif + /* + ** .pp + ** \fIThis is a read-only system property and specifies the + ** header chaching's database backend.\fP + */ +#endif + {"madmutt_folder_path", DT_SYS, R_NONE, 0, "" }, + /* + ** .pp + ** \fIThis is a read-only system property and, at runtime, + ** specifies the full path or URI of the folder currently + ** open (if any).\fP + */ + {"madmutt_folder_name", DT_SYS, R_NONE, 0, "" }, + /* + ** .pp + ** \fIThis is a read-only system property and, at runtime, + ** specifies the actual name of the folder as far as it could + ** be detected.\fP + ** .pp + ** For detection, $$$folder is first taken into account + ** and simply stripped to form the result when a match is found. For + ** example, with $$$folder being \fTimap://host\fP and the folder is + ** \fTimap://host/INBOX/foo\fP, $$$madmutt_folder_name will be just + ** \fTINBOX/foo\fP.) + ** .pp + ** Second, if the initial portion of a name is not $$$folder, + ** the result will be everything after the last ``/''. + ** .pp + ** Third and last, the result will be just the name if neither + ** $$$folder nor a ``/'' were found in the name. + */ + {"madmutt_pwd", DT_SYS, R_NONE, 0, "" }, + /* + ** .pp + ** \fIThis is a read-only system property and, at runtime, + ** specifies the current working directory of the madmutt + ** binary.\fP + */ + {"operating_system", DT_STR, R_NONE, UL &OperatingSystem, "" }, /* ** .pp ** This specifies the operating system name for the \fTUser-Agent:\fP header field. If ** this is \fIunset\fP, it will be set to the operating system name that \fTuname(2)\fP ** returns. If \fTuname(2)\fP fails, ``UNIX'' will be used. ** .pp - ** It may, for example, look as: ``\fTmutt-ng 1.5.9i (Linux)\fP''. + ** It may, for example, look as: ``\fTMadmutt 1.5.9i (Linux)\fP''. */ - {"sidebar_boundary", DT_STR, R_BOTH, UL &SidebarBoundary, UL "." }, + {"sidebar_boundary", DT_STR, R_BOTH, UL &SidebarBoundary, "." }, /* ** .pp ** When the sidebar is displayed and $$sidebar_shorten_hierarchy is \fIset\fP, this ** variable specifies the characters at which to split a folder name into ** ``hierarchy items.'' */ - {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, UL "|"}, + {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, "|"}, /* ** .pp ** This specifies the delimiter between the sidebar (if visible) and ** other screens. */ - {"sidebar_visible", DT_BOOL, R_BOTH, OPTMBOXPANE, 0}, + {"sidebar_visible", DT_BOOL, R_BOTH, OPTMBOXPANE, "no" }, /* ** .pp ** This specifies whether or not to show the sidebar (a list of folders specified ** with the ``mailboxes'' command). */ - {"sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0}, + {"sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, "0" }, /* ** .pp ** The width of the sidebar. */ - {"sidebar_newmail_only", DT_BOOL, R_BOTH, OPTSIDEBARNEWMAILONLY, 0}, + {"sidebar_newmail_only", DT_BOOL, R_BOTH, OPTSIDEBARNEWMAILONLY, "no" }, /* ** .pp ** If \fIset\fP, only folders with new mail will be shown in the sidebar. */ - {"sidebar_number_format", DT_STR, R_BOTH, UL &SidebarNumberFormat, UL "%m%?n?(%n)?%?f?[%f]?"}, + {"sidebar_number_format", DT_STR, R_BOTH, UL &SidebarNumberFormat, "%m%?n?(%n)?%?f?[%f]?"}, /* ** .pp ** This variable controls how message counts are printed when the sidebar ** is enabled. If this variable is \fIempty\fP (\fIand only if\fP), no numbers - ** will be printed \fIand\fP mutt-ng won't frequently count mail (which + ** will be printed \fIand\fP Madmutt won't frequently count mail (which ** may be a great speedup esp. with mbox-style mailboxes.) ** .pp ** The following \fTprintf(3)\fP-like sequences are supported all of which @@ -1418,12 +1521,13 @@ struct option_t MuttVars[] = { ** .dt %M .dd Total number of messages shown, i.e. not hidden by a limit. 1) ** .dt %n .dd Number of new messages. ** .dt %t .dd Number of tagged messages. 1) + ** .dt %u .dd Number of unread messages. ** .de ** .pp ** 1) These expandos only have a non-zero value for the current mailbox and ** will always be zero otherwise. */ - {"sidebar_shorten_hierarchy", DT_BOOL, R_NONE, OPTSHORTENHIERARCHY, 0}, + {"sidebar_shorten_hierarchy", DT_BOOL, R_NONE, OPTSHORTENHIERARCHY, "no" }, /* ** .pp ** When \fIset\fP, the ``hierarchy'' of the sidebar entries will be shortened @@ -1436,32 +1540,32 @@ struct option_t MuttVars[] = { ** At which characters this compression is done is controled via the ** $$sidebar_boundary variable. */ - {"mbox_type", DT_MAGIC, R_NONE, UL &DefaultMagic, M_MBOX}, + {"mbox_type", DT_MAGIC, R_NONE, UL &DefaultMagic, "mbox" }, /* ** .pp ** The default mailbox type used when creating new folders. May be any of ** \fTmbox\fP, \fTMMDF\fP, \fTMH\fP and \fTMaildir\fP. */ - {"metoo", DT_BOOL, R_NONE, OPTMETOO, 0}, + {"metoo", DT_BOOL, R_NONE, OPTMETOO, "no" }, /* ** .pp - ** If \fIunset\fP, Mutt-ng will remove your address (see the ``alternates'' + ** If \fIunset\fP, Madmutt will remove your address (see the ``alternates'' ** command) from the list of recipients when replying to a message. */ - {"menu_context", DT_NUM, R_NONE, UL &MenuContext, 0}, + {"menu_context", DT_NUM, R_NONE, UL &MenuContext, "0" }, /* ** .pp ** This variable controls the number of lines of context that are given ** when scrolling through menus. (Similar to ``$$pager_context''.) */ - {"menu_move_off", DT_BOOL, R_NONE, OPTMENUMOVEOFF, 1}, + {"menu_move_off", DT_BOOL, R_NONE, OPTMENUMOVEOFF, "yes" }, /* ** .pp ** When \fIunset\fP, the bottom entry of menus will never scroll up past ** the bottom of the screen, unless there are less entries than lines. ** When \fIset\fP, the bottom entry may move off the bottom. */ - {"menu_scroll", DT_BOOL, R_NONE, OPTMENUSCROLL, 0}, + {"menu_scroll", DT_BOOL, R_NONE, OPTMENUSCROLL, "no" }, /* ** .pp ** When \fIset\fP, menus will be scrolled up or down one line when you @@ -1469,41 +1573,41 @@ struct option_t MuttVars[] = { ** is cleared and the next or previous page of the menu is displayed ** (useful for slow links to avoid many redraws). */ - {"meta_key", DT_BOOL, R_NONE, OPTMETAKEY, 0}, + {"meta_key", DT_BOOL, R_NONE, OPTMETAKEY, "no" }, /* ** .pp - ** If \fIset\fP, forces Mutt-ng to interpret keystrokes with the high bit (bit 8) + ** If \fIset\fP, forces Madmutt to interpret keystrokes with the high bit (bit 8) ** set as if the user had pressed the \fTESC\fP key and whatever key remains ** after having the high bit removed. For example, if the key pressed - ** has an ASCII value of \fT0xf4\fP, then this is treated as if the user had + ** has an ASCII value of \fT0xf8\fP, then this is treated as if the user had ** pressed \fTESC\fP then ``\fTx\fP''. This is because the result of removing the - ** high bit from ``\fT0xf4\fP'' is ``\fT0x74\fP'', which is the ASCII character + ** high bit from ``\fT0xf8\fP'' is ``\fT0x78\fP'', which is the ASCII character ** ``\fTx\fP''. */ - {"mh_purge", DT_BOOL, R_NONE, OPTMHPURGE, 0}, + {"mh_purge", DT_BOOL, R_NONE, OPTMHPURGE, "no" }, /* ** .pp - ** When \fIunset\fP, Mutt-ng will mimic mh's behaviour and rename deleted messages + ** When \fIunset\fP, Madmutt will mimic mh's behaviour and rename deleted messages ** to \fI,\fP in mh folders instead of really deleting ** them. If the variable is set, the message files will simply be ** deleted. */ - {"mh_seq_flagged", DT_STR, R_NONE, UL &MhFlagged, UL "flagged"}, + {"mh_seq_flagged", DT_STR, R_NONE, UL &MhFlagged, "flagged"}, /* ** .pp ** The name of the MH sequence used for flagged messages. */ - {"mh_seq_replied", DT_STR, R_NONE, UL &MhReplied, UL "replied"}, + {"mh_seq_replied", DT_STR, R_NONE, UL &MhReplied, "replied"}, /* ** .pp ** The name of the MH sequence used to tag replied messages. */ - {"mh_seq_unseen", DT_STR, R_NONE, UL &MhUnseen, UL "unseen"}, + {"mh_seq_unseen", DT_STR, R_NONE, UL &MhUnseen, "unseen"}, /* ** .pp ** The name of the MH sequence used for unseen messages. */ - {"mime_forward", DT_QUAD, R_NONE, OPT_MIMEFWD, M_NO}, + {"mime_forward", DT_QUAD, R_NONE, OPT_MIMEFWD, "no" }, /* ** .pp ** When \fIset\fP, the message you are forwarding will be attached as a @@ -1517,14 +1621,14 @@ struct option_t MuttVars[] = { ** .pp ** Also see ``$$forward_decode'' and ``$$mime_forward_decode''. */ - {"mime_forward_decode", DT_BOOL, R_NONE, OPTMIMEFORWDECODE, 0}, + {"mime_forward_decode", DT_BOOL, R_NONE, OPTMIMEFORWDECODE, "no" }, /* ** .pp ** Controls the decoding of complex MIME messages into \fTtext/plain\fP when ** forwarding a message while ``$$mime_forward'' is \fIset\fP. Otherwise ** ``$$forward_decode'' is used instead. */ - {"mime_forward_rest", DT_QUAD, R_NONE, OPT_MIMEFWDREST, M_YES}, + {"mime_forward_rest", DT_QUAD, R_NONE, OPT_MIMEFWDREST, "yes" }, /* ** .pp ** When forwarding multiple attachments of a MIME message from the recvattach @@ -1533,8 +1637,7 @@ struct option_t MuttVars[] = { */ #ifdef USE_NNTP - {"mime_subject", DT_SYN, R_NONE, UL "nntp_mime_subject", 0}, - {"nntp_mime_subject", DT_BOOL, R_NONE, OPTMIMESUBJECT, 1}, + {"nntp_mime_subject", DT_BOOL, R_NONE, OPTMIMESUBJECT, "yes" }, /* ** .pp ** Availability: NNTP @@ -1548,7 +1651,7 @@ struct option_t MuttVars[] = { #endif #ifdef MIXMASTER - {"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, UL "%4n %c %-16s %a"}, + {"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, "%4n %c %-16s %a"}, /* ** .pp ** Availability: Mixmaster @@ -1565,7 +1668,7 @@ struct option_t MuttVars[] = { ** .dt %a .dd The remailer's e-mail address. ** .de */ - {"mixmaster", DT_PATH, R_NONE, UL &Mixmaster, UL MIXMASTER}, + {"mixmaster", DT_PATH, R_NONE, UL &Mixmaster, MIXMASTER}, /* ** .pp ** Availability: Mixmaster @@ -1577,25 +1680,25 @@ struct option_t MuttVars[] = { ** mixmaster chain. */ #endif - {"move", DT_QUAD, R_NONE, OPT_MOVE, M_ASKNO}, + {"move", DT_QUAD, R_NONE, OPT_MOVE, "ask-no" }, /* ** .pp - ** Controls whether or not Mutt-ng will move read messages + ** Controls whether or not Madmutt will move read messages ** from your spool mailbox to your ``$$mbox'' mailbox, or as a result of ** a ``$mbox-hook'' command. */ - {"message_format", DT_STR, R_NONE, UL &MsgFmt, UL "%s"}, + {"message_format", DT_STR, R_NONE, UL &MsgFmt, "%s"}, /* ** .pp ** This is the string displayed in the ``attachment'' menu for ** attachments of type \fTmessage/rfc822\fP. For a full listing of defined ** \fTprintf(3)\fP-like sequences see the section on ``$$index_format''. */ - {"msgid_format", DT_STR, R_NONE, UL &MsgIdFormat, UL "%Y%m%d%h%M%s.G%P%p"}, + {"msgid_format", DT_STR, R_NONE, UL &MsgIdFormat, "%Y%m%d%h%M%s.G%P%p"}, /* ** .pp - ** This is the format for the ``local part'' of the \fTMessage-Id:\fP header - ** field generated by Mutt-ng. If this variable is empty, no \fTMessage-Id:\fP + ** This is the format for the ``local part'' of the \fTMessage-ID:\fP header + ** field generated by Madmutt. If this variable is empty, no \fTMessage-ID:\fP ** headers will be generated. The '%' ** character marks that certain data will be added to the string, similar to ** \fTprintf(3)\fP. The following characters are allowed: @@ -1621,29 +1724,27 @@ struct option_t MuttVars[] = { ** \fBNote:\fP Please only change this setting if you know what you are doing. ** Also make sure to consult RFC2822 to produce technically \fIvalid\fP strings. */ - {"narrow_tree", DT_BOOL, R_TREE|R_INDEX, OPTNARROWTREE, 0}, + {"narrow_tree", DT_BOOL, R_TREE|R_INDEX, OPTNARROWTREE, "no" }, /* ** .pp ** This variable, when \fIset\fP, makes the thread tree narrower, allowing ** deeper threads to fit on the screen. */ #ifdef USE_NNTP - {"news_cache_dir", DT_SYN, R_NONE, UL "nntp_cache_dir", 0}, - {"nntp_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, UL "~/.muttng"}, + {"nntp_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, "~/.madmutt"}, /* ** .pp ** Availability: NNTP ** ** .pp - ** This variable points to directory where Mutt-ng will cache news + ** This variable points to directory where Madmutt will cache news ** article headers. If \fIunset\fP, headers will not be saved at all ** and will be reloaded each time when you enter a newsgroup. ** .pp ** As for the header caching in connection with IMAP and/or Maildir, ** this drastically increases speed and lowers traffic. */ - {"news_server", DT_SYN, R_NONE, UL "nntp_host", 0}, - {"nntp_host", DT_STR, R_NONE, UL &NewsServer, 0}, + {"nntp_host", DT_STR, R_NONE, UL &NewsServer, "" }, /* ** .pp ** Availability: NNTP @@ -1664,8 +1765,7 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ - {"newsrc", DT_SYN, R_NONE, UL "nntp_newsrc", 0}, - {"nntp_newsrc", DT_PATH, R_NONE, UL &NewsRc, UL "~/.newsrc"}, + {"nntp_newsrc", DT_PATH, R_NONE, UL &NewsRc, "~/.newsrc"}, /* ** .pp ** Availability: NNTP @@ -1681,7 +1781,7 @@ struct option_t MuttVars[] = { ** %s newsserver name ** .te */ - {"nntp_context", DT_NUM, R_NONE, UL &NntpContext, 1000}, + {"nntp_context", DT_NUM, R_NONE, UL &NntpContext, "1000" }, /* ** .pp ** Availability: NNTP @@ -1694,7 +1794,7 @@ struct option_t MuttVars[] = { ** If there're more articles than defined with $$nntp_context, all older ones ** will be removed/not shown in the index. */ - {"nntp_load_description", DT_BOOL, R_NONE, OPTLOADDESC, 1}, + {"nntp_load_description", DT_BOOL, R_NONE, OPTLOADDESC, "yes" }, /* ** .pp ** Availability: NNTP @@ -1703,16 +1803,16 @@ struct option_t MuttVars[] = { ** This variable controls whether or not descriptions for newsgroups ** are to be loaded when subscribing to a newsgroup. */ - {"nntp_user", DT_STR, R_NONE, UL &NntpUser, UL ""}, + {"nntp_user", DT_STR, R_NONE, UL &NntpUser, ""}, /* ** .pp ** Availability: NNTP ** ** .pp ** Your login name on the NNTP server. If \fIunset\fP and the server requires - ** authentification, Mutt-ng will prompt you for your account name. + ** authentification, Madmutt will prompt you for your account name. */ - {"nntp_pass", DT_STR, R_NONE, UL &NntpPass, UL ""}, + {"nntp_pass", DT_STR, R_NONE, UL &NntpPass, ""}, /* ** .pp ** Availability: NNTP @@ -1724,28 +1824,36 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ - {"nntp_poll", DT_SYN, R_NONE, UL "nntp_mail_check", 0}, - {"nntp_mail_check", DT_NUM, R_NONE, UL &NewsPollTimeout, 60}, + {"nntp_mail_check", DT_NUM, R_NONE, UL &NewsPollTimeout, "60" }, /* ** .pp ** Availability: NNTP ** ** .pp ** The time in seconds until any operations on a newsgroup except posting a new - ** article will cause a recheck for new news. If set to 0, Mutt-ng will + ** article will cause a recheck for new news. If set to 0, Madmutt will ** recheck on each operation in index (stepping, read article, etc.). */ - {"nntp_reconnect", DT_QUAD, R_NONE, OPT_NNTPRECONNECT, M_ASKYES}, + {"nntp_reconnect", DT_QUAD, R_NONE, OPT_NNTPRECONNECT, "ask-yes" }, /* ** .pp ** Availability: NNTP ** ** .pp - ** Controls whether or not Mutt-ng will try to reconnect to a newsserver when the + ** Controls whether or not Madmutt will try to reconnect to a newsserver when the ** was connection lost. */ #endif - {"pager", DT_PATH, R_NONE, UL &Pager, UL "builtin"}, + { "net_inc", DT_NUM, R_NONE, UL &NetInc, "10" }, + /* + ** .pp + ** Operations that expect to transfer a large amount of data over the + ** network will update their progress every \fInet_inc\fP kilobytes. + ** If set to 0, no progress messages will be displayed. + ** .pp + ** See also ``$$read_inc'' and ``$$write_inc''. + */ + {"pager", DT_PATH, R_NONE, UL &Pager, "builtin"}, /* ** .pp ** This variable specifies which pager you would like to use to view @@ -1754,19 +1862,19 @@ struct option_t MuttVars[] = { ** like to use. ** .pp ** Using an external pager may have some disadvantages: Additional - ** keystrokes are necessary because you can't call Mutt-ng functions + ** keystrokes are necessary because you can't call Madmutt functions ** directly from the pager, and screen resizes cause lines longer than ** the screen width to be badly formatted in the help menu. */ - {"pager_context", DT_NUM, R_NONE, UL &PagerContext, 0}, + {"pager_context", DT_NUM, R_NONE, UL &PagerContext, "0" }, /* ** .pp ** This variable controls the number of lines of context that are given ** when displaying the next or previous page in the internal pager. By - ** default, Mutt-ng will display the line after the last one on the screen + ** default, Madmutt will display the line after the last one on the screen ** at the top of the next page (0 lines of context). */ - {"pager_format", DT_STR, R_PAGER, UL &PagerFmt, UL "-%Z- %C/%m: %-20.20n %s"}, + {"pager_format", DT_STR, R_PAGER, UL &PagerFmt, "-%Z- %C/%m: %-20.20n %s"}, /* ** .pp ** This variable controls the format of the one-line message ``status'' @@ -1774,7 +1882,7 @@ struct option_t MuttVars[] = { ** pager. The valid sequences are listed in the ``$$index_format'' ** section. */ - {"pager_index_lines", DT_NUM, R_PAGER, UL &PagerIndexLines, 0}, + {"pager_index_lines", DT_NUM, R_PAGER, UL &PagerIndexLines, "0" }, /* ** .pp ** Determines the number of lines of a mini-index which is shown when in @@ -1789,17 +1897,17 @@ struct option_t MuttVars[] = { ** is less than \fIpager_index_lines\fP, then the index will only use as ** many lines as it needs. */ - {"pager_stop", DT_BOOL, R_NONE, OPTPAGERSTOP, 0}, + {"pager_stop", DT_BOOL, R_NONE, OPTPAGERSTOP, "no" }, /* ** .pp ** When \fIset\fP, the internal-pager will \fBnot\fP move to the next message ** when you are at the end of a message and invoke the \fInext-page\fP ** function. */ - {"crypt_autosign", DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, 0}, + {"crypt_autosign", DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, "no" }, /* ** .pp - ** Setting this variable will cause Mutt-ng to always attempt to + ** Setting this variable will cause Madmutt to always attempt to ** cryptographically sign outgoing messages. This can be overridden ** by use of the \fIpgp-menu\fP, when signing is not required or ** encryption is requested as well. If ``$$smime_is_default'' is \fIset\fP, @@ -1807,10 +1915,10 @@ struct option_t MuttVars[] = { ** be overridden by use of the \fIsmime-menu\fP. ** (Crypto only) */ - {"crypt_autoencrypt", DT_BOOL, R_NONE, OPTCRYPTAUTOENCRYPT, 0}, + {"crypt_autoencrypt", DT_BOOL, R_NONE, OPTCRYPTAUTOENCRYPT, "no" }, /* ** .pp - ** Setting this variable will cause Mutt-ng to always attempt to PGP + ** Setting this variable will cause Madmutt to always attempt to PGP ** encrypt outgoing messages. This is probably only useful in ** connection to the \fIsend-hook\fP command. It can be overridden ** by use of the \fIpgp-menu\fP, when encryption is not required or @@ -1819,22 +1927,22 @@ struct option_t MuttVars[] = { ** settings can be overridden by use of the \fIsmime-menu\fP. ** (Crypto only) */ - {"pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, 1}, + {"pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, "yes" }, /* ** .pp - ** Setting this variable will cause Mutt-ng to ignore OpenPGP subkeys. Instead, + ** Setting this variable will cause Madmutt to ignore OpenPGP subkeys. Instead, ** the principal key will inherit the subkeys' capabilities. \fIUnset\fP this ** if you want to play interesting key selection games. ** (PGP only) */ - {"crypt_replyencrypt", DT_BOOL, R_NONE, OPTCRYPTREPLYENCRYPT, 1}, + {"crypt_replyencrypt", DT_BOOL, R_NONE, OPTCRYPTREPLYENCRYPT, "yes" }, /* ** .pp ** If \fIset\fP, automatically PGP or OpenSSL encrypt replies to messages which are ** encrypted. ** (Crypto only) */ - {"crypt_replysign", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGN, 0}, + {"crypt_replysign", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGN, "no" }, /* ** .pp ** If \fIset\fP, automatically PGP or OpenSSL sign replies to messages which are @@ -1843,33 +1951,33 @@ struct option_t MuttVars[] = { ** \fBNote:\fP this does not work on messages that are encrypted \fBand\fP signed! ** (Crypto only) */ - {"crypt_replysignencrypted", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGNENCRYPTED, 0}, + {"crypt_replysignencrypted", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGNENCRYPTED, "no" }, /* ** .pp ** If \fIset\fP, automatically PGP or OpenSSL sign replies to messages ** which are encrypted. This makes sense in combination with ** ``$$crypt_replyencrypt'', because it allows you to sign all ** messages which are automatically encrypted. This works around - ** the problem noted in ``$$crypt_replysign'', that Mutt-ng is not able + ** the problem noted in ``$$crypt_replysign'', that Madmutt is not able ** to find out whether an encrypted message is also signed. ** (Crypto only) */ - {"crypt_timestamp", DT_BOOL, R_NONE, OPTCRYPTTIMESTAMP, 1}, + {"crypt_timestamp", DT_BOOL, R_NONE, OPTCRYPTTIMESTAMP, "yes" }, /* ** .pp - ** If \fIset\fP, Mutt-ng will include a time stamp in the lines surrounding + ** If \fIset\fP, Madmutt will include a time stamp in the lines surrounding ** PGP or S/MIME output, so spoofing such lines is more difficult. ** If you are using colors to mark these lines, and rely on these, ** you may \fIunset\fP this setting. ** (Crypto only) */ - {"pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0}, + {"pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, "no" }, /* ** .pp - ** If \fIset\fP, Mutt-ng will use a possibly-running gpg-agent process. + ** If \fIset\fP, Madmutt will use a possibly-running gpg-agent process. ** (PGP only) */ - {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, M_YES}, + {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, "yes" }, /* ** .pp ** If ``\fIyes\fP'', always attempt to verify PGP or S/MIME signatures. @@ -1877,20 +1985,20 @@ struct option_t MuttVars[] = { ** If ``\fIno\fP'', never attempt to verify cryptographic signatures. ** (Crypto only) */ - {"smime_is_default", DT_BOOL, R_NONE, OPTSMIMEISDEFAULT, 0}, + {"smime_is_default", DT_BOOL, R_NONE, OPTSMIMEISDEFAULT, "no" }, /* ** .pp - ** The default behaviour of Mutt-ng is to use PGP on all auto-sign/encryption + ** The default behaviour of Madmutt is to use PGP on all auto-sign/encryption ** operations. To override and to use OpenSSL instead this must be \fIset\fP. ** .pp - ** However, this has no effect while replying, since Mutt-ng will automatically + ** However, this has no effect while replying, since Madmutt will automatically ** select the same application that was used to sign/encrypt the original ** message. ** .pp ** (Note that this variable can be overridden by unsetting $$crypt_autosmime.) ** (S/MIME only) */ - {"smime_ask_cert_label", DT_BOOL, R_NONE, OPTASKCERTLABEL, 1}, + {"smime_ask_cert_label", DT_BOOL, R_NONE, OPTASKCERTLABEL, "yes" }, /* ** .pp ** This flag controls whether you want to be asked to enter a label @@ -1898,15 +2006,15 @@ struct option_t MuttVars[] = { ** \fIset\fP by default. ** (S/MIME only) */ - {"smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1}, + {"smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, "yes" }, /* ** .pp - ** If \fIset\fP (default) this tells Mutt-ng to use the default key for decryption. Otherwise, - ** if manage multiple certificate-key-pairs, Mutt-ng will try to use the mailbox-address + ** If \fIset\fP (default) this tells Madmutt to use the default key for decryption. Otherwise, + ** if manage multiple certificate-key-pairs, Madmutt will try to use the mailbox-address ** to determine the key to use. It will ask you to supply a key, if it can't find one. ** (S/MIME only) */ - {"pgp_entry_format", DT_STR, R_NONE, UL &PgpEntryFormat, UL "%4n %t%f %4l/0x%k %-4a %2c %u"}, + {"pgp_entry_format", DT_STR, R_NONE, UL &PgpEntryFormat, "%4n %t%f %4l/0x%k %-4a %2c %u"}, /* ** .pp ** This variable allows you to customize the PGP key selection menu to @@ -1927,7 +2035,7 @@ struct option_t MuttVars[] = { ** .pp ** (PGP only) */ - {"pgp_good_sign", DT_RX, R_NONE, UL &PgpGoodSign, 0}, + {"pgp_good_sign", DT_RX, R_NONE, UL &PgpGoodSign, "" }, /* ** .pp ** If you assign a text to this variable, then a PGP signature is only @@ -1936,21 +2044,21 @@ struct option_t MuttVars[] = { ** even for bad signatures. ** (PGP only) */ - {"pgp_check_exit", DT_BOOL, R_NONE, OPTPGPCHECKEXIT, 1}, + {"pgp_check_exit", DT_BOOL, R_NONE, OPTPGPCHECKEXIT, "yes" }, /* ** .pp - ** If \fIset\fP, Mutt-ng will check the exit code of the PGP subprocess when + ** If \fIset\fP, Madmutt will check the exit code of the PGP subprocess when ** signing or encrypting. A non-zero exit code means that the ** subprocess failed. ** (PGP only) */ - {"pgp_long_ids", DT_BOOL, R_NONE, OPTPGPLONGIDS, 0}, + {"pgp_long_ids", DT_BOOL, R_NONE, OPTPGPLONGIDS, "no" }, /* ** .pp ** If \fIset\fP, use 64 bit PGP key IDs. \fIUnset\fP uses the normal 32 bit Key IDs. ** (PGP only) */ - {"pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, 0}, + {"pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, "no" }, /* ** .pp ** If \fIset\fP, signed and encrypted messages will consist of nested @@ -1961,16 +2069,16 @@ struct option_t MuttVars[] = { ** removed, while the inner multipart/signed part is retained. ** (PGP only) */ - {"pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, 0}, + {"pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, "no" }, /* ** .pp - ** This option controls whether Mutt-ng generates old-style inline + ** This option controls whether Madmutt generates old-style inline ** (traditional) PGP encrypted or signed messages under certain ** circumstances. This can be overridden by use of the \fIpgp-menu\fP, ** when inline is not required. ** .pp - ** Note that Mutt-ng might automatically use PGP/MIME for messages - ** which consist of more than a single MIME part. Mutt-ng can be + ** Note that Madmutt might automatically use PGP/MIME for messages + ** which consist of more than a single MIME part. Madmutt can be ** configured to ask before sending PGP/MIME messages when inline ** (traditional) would not work. ** See also: ``$$pgp_mime_auto''. @@ -1979,19 +2087,19 @@ struct option_t MuttVars[] = { ** \fBdeprecated\fP. ** (PGP only) */ - {"pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, 0}, + {"pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, "no" }, /* ** .pp - ** Setting this variable will cause Mutt-ng to always attempt to + ** Setting this variable will cause Madmutt to always attempt to ** create an inline (traditional) message when replying to a ** message which is PGP encrypted/signed inline. This can be ** overridden by use of the \fIpgp-menu\fP, when inline is not ** required. This option does not automatically detect if the - ** (replied-to) message is inline; instead it relies on Mutt-ng + ** (replied-to) message is inline; instead it relies on Madmutt ** internals for previously checked/flagged messages. ** .pp - ** Note that Mutt-ng might automatically use PGP/MIME for messages - ** which consist of more than a single MIME part. Mutt-ng can be + ** Note that Madmutt might automatically use PGP/MIME for messages + ** which consist of more than a single MIME part. Madmutt can be ** configured to ask before sending PGP/MIME messages when inline ** (traditional) would not work. ** See also: ``$$pgp_mime_auto''. @@ -2001,15 +2109,15 @@ struct option_t MuttVars[] = { ** (PGP only) ** */ - {"pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, 1}, + {"pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, "yes" }, /* ** .pp - ** If \fIset\fP, Mutt-ng will display non-usable keys on the PGP key selection + ** If \fIset\fP, Madmutt will display non-usable keys on the PGP key selection ** menu. This includes keys which have been revoked, have expired, or ** have been marked as ``disabled'' by the user. ** (PGP only) */ - {"pgp_sign_as", DT_STR, R_NONE, UL &PgpSignAs, 0}, + {"pgp_sign_as", DT_STR, R_NONE, UL &PgpSignAs, "" }, /* ** .pp ** If you have more than one key pair, this option allows you to specify @@ -2017,23 +2125,23 @@ struct option_t MuttVars[] = { ** keyid form to specify your key (e.g., ``\fT0x00112233\fP''). ** (PGP only) */ - {"pgp_strict_enc", DT_BOOL, R_NONE, OPTPGPSTRICTENC, 1}, + {"pgp_strict_enc", DT_BOOL, R_NONE, OPTPGPSTRICTENC, "yes" }, /* ** .pp - ** If \fIset\fP, Mutt-ng will automatically encode PGP/MIME signed messages as + ** If \fIset\fP, Madmutt will automatically encode PGP/MIME signed messages as ** \fTquoted-printable\fP. Please note that unsetting this variable may ** lead to problems with non-verifyable PGP signatures, so only change ** this if you know what you are doing. ** (PGP only) */ - {"pgp_timeout", DT_NUM, R_NONE, UL &PgpTimeout, 300}, + {"pgp_timeout", DT_NUM, R_NONE, UL &PgpTimeout, "300" }, /* ** .pp ** The number of seconds after which a cached passphrase will expire if ** not used. Default: 300. ** (PGP only) */ - {"pgp_sort_keys", DT_SORT|DT_SORT_KEYS, R_NONE, UL &PgpSortKeys, SORT_ADDRESS}, + {"pgp_sort_keys", DT_SORT|DT_SORT_KEYS, R_NONE, UL &PgpSortKeys, "address" }, /* ** .pp ** Specifies how the entries in the ``pgp keys'' menu are sorted. The @@ -2050,10 +2158,10 @@ struct option_t MuttVars[] = { ** ``reverse-''. ** (PGP only) */ - {"pgp_mime_auto", DT_QUAD, R_NONE, OPT_PGPMIMEAUTO, M_ASKYES}, + {"pgp_mime_auto", DT_QUAD, R_NONE, OPT_PGPMIMEAUTO, "ask-yes" }, /* ** .pp - ** This option controls whether Mutt-ng will prompt you for + ** This option controls whether Madmutt will prompt you for ** automatically sending a (signed/encrypted) message using ** PGP/MIME when inline (traditional) fails (for any reason). ** .pp @@ -2061,20 +2169,20 @@ struct option_t MuttVars[] = { ** \fBdeprecated\fP. ** (PGP only) */ - {"pgp_auto_decode", DT_BOOL, R_NONE, OPTPGPAUTODEC, 0}, + {"pgp_auto_decode", DT_BOOL, R_NONE, OPTPGPAUTODEC, "no" }, /* ** .pp - ** If \fIset\fP, Mutt-ng will automatically attempt to decrypt traditional PGP + ** If \fIset\fP, Madmutt will automatically attempt to decrypt traditional PGP ** messages whenever the user performs an operation which ordinarily would ** result in the contents of the message being operated on. For example, ** if the user displays a pgp-traditional message which has not been manually - ** checked with the check-traditional-pgp function, Mutt-ng will automatically + ** checked with the check-traditional-pgp function, Madmutt will automatically ** check the message for traditional pgp. */ /* XXX Default values! */ - {"pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, 0}, + {"pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, "" }, /* ** .pp ** This format strings specifies a command which is used to decode @@ -2098,26 +2206,26 @@ struct option_t MuttVars[] = { ** alongside the documentation. ** (PGP only) */ - {"pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, 0}, + {"pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, "" }, /* ** .pp - ** This command is invoked whenever Mutt-ng will need public key information. + ** This command is invoked whenever Madmutt will need public key information. ** \fT%r\fP is the only \fTprintf(3)\fP-like sequence used with this format. ** (PGP only) */ - {"pgp_verify_command", DT_STR, R_NONE, UL &PgpVerifyCommand, 0}, + {"pgp_verify_command", DT_STR, R_NONE, UL &PgpVerifyCommand, "" }, /* ** .pp ** This command is used to verify PGP signatures. ** (PGP only) */ - {"pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, 0}, + {"pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, "" }, /* ** .pp ** This command is used to decrypt a PGP encrypted message. ** (PGP only) */ - {"pgp_clearsign_command", DT_STR, R_NONE, UL &PgpClearSignCommand, 0}, + {"pgp_clearsign_command", DT_STR, R_NONE, UL &PgpClearSignCommand, "" }, /* ** .pp ** This format is used to create a old-style ``clearsigned'' PGP message. @@ -2125,47 +2233,47 @@ struct option_t MuttVars[] = { ** Note that the use of this format is \fBstrongly\fP \fBdeprecated\fP. ** (PGP only) */ - {"pgp_sign_command", DT_STR, R_NONE, UL &PgpSignCommand, 0}, + {"pgp_sign_command", DT_STR, R_NONE, UL &PgpSignCommand, "" }, /* ** .pp ** This command is used to create the detached PGP signature for a ** multipart/signed PGP/MIME body part. ** (PGP only) */ - {"pgp_encrypt_sign_command", DT_STR, R_NONE, UL &PgpEncryptSignCommand, 0}, + {"pgp_encrypt_sign_command", DT_STR, R_NONE, UL &PgpEncryptSignCommand, "" }, /* ** .pp ** This command is used to both sign and encrypt a body part. ** (PGP only) */ - {"pgp_encrypt_only_command", DT_STR, R_NONE, UL &PgpEncryptOnlyCommand, 0}, + {"pgp_encrypt_only_command", DT_STR, R_NONE, UL &PgpEncryptOnlyCommand, "" }, /* ** .pp ** This command is used to encrypt a body part without signing it. ** (PGP only) */ - {"pgp_import_command", DT_STR, R_NONE, UL &PgpImportCommand, 0}, + {"pgp_import_command", DT_STR, R_NONE, UL &PgpImportCommand, "" }, /* ** .pp ** This command is used to import a key from a message into ** the user's public key ring. ** (PGP only) */ - {"pgp_export_command", DT_STR, R_NONE, UL &PgpExportCommand, 0}, + {"pgp_export_command", DT_STR, R_NONE, UL &PgpExportCommand, "" }, /* ** .pp ** This command is used to export a public key from the user's ** key ring. ** (PGP only) */ - {"pgp_verify_key_command", DT_STR, R_NONE, UL &PgpVerifyKeyCommand, 0}, + {"pgp_verify_key_command", DT_STR, R_NONE, UL &PgpVerifyKeyCommand, "" }, /* ** .pp ** This command is used to verify key information from the key selection ** menu. ** (PGP only) */ - {"pgp_list_secring_command", DT_STR, R_NONE, UL &PgpListSecringCommand, 0}, + {"pgp_list_secring_command", DT_STR, R_NONE, UL &PgpListSecringCommand, "" }, /* ** .pp ** This command is used to list the secret key ring's contents. The @@ -2173,10 +2281,10 @@ struct option_t MuttVars[] = { ** \fTgpg --list-keys --with-colons\fP. ** .pp ** This format is also generated by the \fTpgpring\fP utility which comes - ** with Mutt-ng. + ** with Madmutt. ** (PGP only) */ - {"pgp_list_pubring_command", DT_STR, R_NONE, UL &PgpListPubringCommand, 0}, + {"pgp_list_pubring_command", DT_STR, R_NONE, UL &PgpListPubringCommand, "" }, /* ** .pp ** This command is used to list the public key ring's contents. The @@ -2184,10 +2292,10 @@ struct option_t MuttVars[] = { ** \fTgpg --list-keys --with-colons\fP. ** .pp ** This format is also generated by the \fTpgpring\fP utility which comes - ** with Mutt-ng. + ** with Madmutt. ** (PGP only) */ - {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, 1}, + {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, "yes" }, /* ** .pp ** Controls the handling of encrypted messages when forwarding a message. @@ -2196,14 +2304,14 @@ struct option_t MuttVars[] = { ** ``$$mime_forward_decode'' is \fIunset\fP. ** (PGP only) */ - {"smime_timeout", DT_NUM, R_NONE, UL &SmimeTimeout, 300}, + {"smime_timeout", DT_NUM, R_NONE, UL &SmimeTimeout, "300" }, /* ** .pp ** The number of seconds after which a cached passphrase will expire if ** not used. ** (S/MIME only) */ - {"smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, 0}, + {"smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, "" }, /* ** .pp ** This sets the algorithm that should be used for encryption. @@ -2213,10 +2321,10 @@ struct option_t MuttVars[] = { ** If \fIunset\fP ``\fI3des\fP'' (TripleDES) is used. ** (S/MIME only) */ - {"smime_keys", DT_PATH, R_NONE, UL &SmimeKeys, 0}, + {"smime_keys", DT_PATH, R_NONE, UL &SmimeKeys, "" }, /* ** .pp - ** Since there is no pubring/secring as with PGP, Mutt-ng has to handle + ** Since there is no pubring/secring as with PGP, Madmutt has to handle ** storage ad retrieval of keys/certs by itself. This is very basic right now, ** and stores keys and certificates in two different directories, both ** named as the hash-value retrieved from OpenSSL. There is an index file @@ -2224,17 +2332,17 @@ struct option_t MuttVars[] = { ** edited. This one points to the location of the private keys. ** (S/MIME only) */ - {"smime_ca_location", DT_PATH, R_NONE, UL &SmimeCALocation, 0}, + {"smime_ca_location", DT_PATH, R_NONE, UL &SmimeCALocation, "" }, /* ** .pp ** This variable contains the name of either a directory, or a file which ** contains trusted certificates for use with OpenSSL. ** (S/MIME only) */ - {"smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, 0}, + {"smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, "" }, /* ** .pp - ** Since there is no pubring/secring as with PGP, Mutt-ng has to handle + ** Since there is no pubring/secring as with PGP, Madmutt has to handle ** storage and retrieval of keys by itself. This is very basic right ** now, and keys and certificates are stored in two different ** directories, both named as the hash-value retrieved from @@ -2243,7 +2351,7 @@ struct option_t MuttVars[] = { ** the location of the certificates. ** (S/MIME only) */ - {"smime_decrypt_command", DT_STR, R_NONE, UL &SmimeDecryptCommand, 0}, + {"smime_decrypt_command", DT_STR, R_NONE, UL &SmimeDecryptCommand, "" }, /* ** .pp ** This format string specifies a command which is used to decrypt @@ -2269,27 +2377,27 @@ struct option_t MuttVars[] = { ** alongside the documentation. ** (S/MIME only) */ - {"smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, 0}, + {"smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, "" }, /* ** .pp ** This command is used to verify S/MIME signatures of type \fTmultipart/signed\fP. ** (S/MIME only) */ - {"smime_verify_opaque_command", DT_STR, R_NONE, UL &SmimeVerifyOpaqueCommand, 0}, + {"smime_verify_opaque_command", DT_STR, R_NONE, UL &SmimeVerifyOpaqueCommand, "" }, /* ** .pp ** This command is used to verify S/MIME signatures of type ** \fTapplication/x-pkcs7-mime\fP. ** (S/MIME only) */ - {"smime_sign_command", DT_STR, R_NONE, UL &SmimeSignCommand, 0}, + {"smime_sign_command", DT_STR, R_NONE, UL &SmimeSignCommand, "" }, /* ** .pp ** This command is used to created S/MIME signatures of type ** \fTmultipart/signed\fP, which can be read by all mail clients. ** (S/MIME only) */ - {"smime_sign_opaque_command", DT_STR, R_NONE, UL &SmimeSignOpaqueCommand, 0}, + {"smime_sign_opaque_command", DT_STR, R_NONE, UL &SmimeSignOpaqueCommand, "" }, /* ** .pp ** This command is used to created S/MIME signatures of type @@ -2297,26 +2405,26 @@ struct option_t MuttVars[] = { ** clients supporting the S/MIME extension. ** (S/MIME only) */ - {"smime_encrypt_command", DT_STR, R_NONE, UL &SmimeEncryptCommand, 0}, + {"smime_encrypt_command", DT_STR, R_NONE, UL &SmimeEncryptCommand, "" }, /* ** .pp ** This command is used to create encrypted S/MIME messages. ** (S/MIME only) */ - {"smime_pk7out_command", DT_STR, R_NONE, UL &SmimePk7outCommand, 0}, + {"smime_pk7out_command", DT_STR, R_NONE, UL &SmimePk7outCommand, "" }, /* ** .pp ** This command is used to extract PKCS7 structures of S/MIME signatures, ** in order to extract the public X509 certificate(s). ** (S/MIME only) */ - {"smime_get_cert_command", DT_STR, R_NONE, UL &SmimeGetCertCommand, 0}, + {"smime_get_cert_command", DT_STR, R_NONE, UL &SmimeGetCertCommand, "" }, /* ** .pp ** This command is used to extract X509 certificates from a PKCS7 structure. ** (S/MIME only) */ - {"smime_get_signer_cert_command", DT_STR, R_NONE, UL &SmimeGetSignerCertCommand, 0}, + {"smime_get_signer_cert_command", DT_STR, R_NONE, UL &SmimeGetSignerCertCommand, "" }, /* ** .pp ** This command is used to extract only the signers X509 certificate from a S/MIME @@ -2324,13 +2432,13 @@ struct option_t MuttVars[] = { ** email's ``\fTFrom:\fP'' header field. ** (S/MIME only) */ - {"smime_import_cert_command", DT_STR, R_NONE, UL &SmimeImportCertCommand, 0}, + {"smime_import_cert_command", DT_STR, R_NONE, UL &SmimeImportCertCommand, "" }, /* ** .pp ** This command is used to import a certificate via \fTsmime_keysng\fP. ** (S/MIME only) */ - {"smime_get_cert_email_command", DT_STR, R_NONE, UL &SmimeGetCertEmailCommand, 0}, + {"smime_get_cert_email_command", DT_STR, R_NONE, UL &SmimeGetCertEmailCommand, "" }, /* ** .pp ** This command is used to extract the mail address(es) used for storing @@ -2338,7 +2446,7 @@ struct option_t MuttVars[] = { ** certificate was issued for the sender's mailbox). ** (S/MIME only) */ - {"smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0}, + {"smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, "" }, /* ** .pp ** This is the default key-pair to use for signing. This must be set to the @@ -2346,22 +2454,24 @@ struct option_t MuttVars[] = { ** (S/MIME only) */ #if defined(USE_LIBESMTP) - {"smtp_auth_username", DT_STR, R_NONE, UL &SmtpAuthUser, 0}, + {"smtp_auth_username", DT_SYN, R_NONE, UL "smtp_user", 0}, + {"smtp_user", DT_STR, R_NONE, UL &SmtpAuthUser, "" }, /* ** .pp ** Availability: SMTP ** ** .pp ** Defines the username to use with SMTP AUTH. Setting this variable will - ** cause Mutt-ng to attempt to use SMTP AUTH when sending. + ** cause Madmutt to attempt to use SMTP AUTH when sending. */ - {"smtp_auth_password", DT_STR, R_NONE, UL &SmtpAuthPass, 0}, + {"smtp_auth_password", DT_SYN, R_NONE, UL "smtp_pass", 0}, + {"smtp_pass", DT_STR, R_NONE, UL &SmtpAuthPass, "" }, /* ** .pp ** Availability: SMTP ** ** .pp - ** Defines the password to use with SMTP AUTH. If ``$$smtp_auth_username'' + ** Defines the password to use with SMTP AUTH. If ``$$smtp_user'' ** is set, but this variable is not, you will be prompted for a password ** when sending. ** .pp @@ -2369,7 +2479,9 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ - {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, 0}, + {"smtp_envelope", DT_SYN, R_NONE, UL "envelope_from_address", 0 }, + + {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, "" }, /* ** .pp ** Availability: SMTP @@ -2379,7 +2491,7 @@ struct option_t MuttVars[] = { ** to invoking the sendmail binary. Setting this variable overrides the ** value of ``$$sendmail'', and any associated variables. */ - {"smtp_port", DT_NUM, R_NONE, UL &SmtpPort, 25}, + {"smtp_port", DT_NUM, R_NONE, UL &SmtpPort, "25" }, /* ** .pp ** Availability: SMTP @@ -2391,10 +2503,24 @@ struct option_t MuttVars[] = { ** Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP ** servers will probably desire 587, the mail submission port. */ + {"smtp_use_tls", DT_STR, R_NONE, UL &SmtpUseTLS, "" }, + /* + ** .pp + ** Availability: SMTP (and SSL) + ** + ** .pp + ** Defines wether to use STARTTLS. If this option is set to ``\fIrequired\fP'' + ** and the server does not support STARTTLS or there is an error in the + ** TLS Handshake, the connection will fail. Setting this to ``\fIenabled\fP'' + ** will try to start TLS and continue without TLS in case of an error. + ** + **.pp + ** Madmutt still needs to have SSL support enabled in order to use it. + */ #endif #if defined(USE_SSL) || defined(USE_GNUTLS) #ifdef USE_SSL - {"ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, 0}, + {"ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, "" }, /* ** .pp ** Availability: SSL @@ -2403,20 +2529,27 @@ struct option_t MuttVars[] = { ** The file containing a client certificate and its associated private ** key. */ -#endif -# if defined(USE_SSL)||defined(USE_GNUTLS) - {"ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES}, +#endif /* USE_SSL */ + {"ssl_force_tls", DT_BOOL, R_NONE, OPTSSLFORCETLS, "no" }, + /* + ** .pp + ** If this variable is \fIset\fP, Madmutt will require that all connections + ** to remote servers be encrypted. Furthermore it will attempt to + ** negotiate TLS even if the server does not advertise the capability, + ** since it would otherwise have to abort the connection anyway. This + ** option supersedes ``$$ssl_starttls''. + */ + {"ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, "yes" }, /* ** .pp ** Availability: SSL or GNUTLS ** ** .pp - ** If \fIset\fP (the default), Mutt-ng will attempt to use STARTTLS on servers - ** advertising the capability. When \fIunset\fP, Mutt-ng will not attempt to + ** If \fIset\fP (the default), Madmutt will attempt to use STARTTLS on servers + ** advertising the capability. When \fIunset\fP, Madmutt will not attempt to ** use STARTTLS regardless of the server's capabilities. */ -# endif - {"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, UL "~/.mutt_certificates"}, + {"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, "~/.mutt_certificates"}, /* ** .pp ** Availability: SSL or GNUTLS @@ -2432,20 +2565,20 @@ struct option_t MuttVars[] = { ** certificate that is signed with one of these CA certificates are ** also automatically accepted. ** .pp - ** Example: \fTset certificate_file=~/.muttng/certificates\fP + ** Example: \fTset certificate_file=~/.madmutt/certificates\fP */ # if defined(_MAKEDOC) || !defined (USE_GNUTLS) - {"ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, 1}, + {"ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, "yes" }, /* ** .pp ** Availability: SSL ** ** .pp - ** If set to \fIyes\fP, Mutt-ng will use CA certificates in the + ** If set to \fIyes\fP, Madmutt will use CA certificates in the ** system-wide certificate store when checking if server certificate ** is signed by a trusted CA. */ - {"entropy_file", DT_PATH, R_NONE, UL &SslEntropyFile, 0}, + {"entropy_file", DT_PATH, R_NONE, UL &SslEntropyFile, "" }, /* ** .pp ** Availability: SSL @@ -2454,7 +2587,7 @@ struct option_t MuttVars[] = { ** The file which includes random data that is used to initialize SSL ** library functions. */ - {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, 1}, + {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "no" }, /* ** .pp ** Availability: SSL @@ -2463,8 +2596,8 @@ struct option_t MuttVars[] = { ** This variables specifies whether to attempt to use SSLv2 in the ** SSL authentication process. */ -# endif - {"ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, 1}, +# endif /* _MAKEDOC || !USE_GNUTLS */ + {"ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, "yes" }, /* ** .pp ** Availability: SSL or GNUTLS @@ -2473,7 +2606,7 @@ struct option_t MuttVars[] = { ** This variables specifies whether to attempt to use SSLv3 in the ** SSL authentication process. */ - {"ssl_use_tlsv1", DT_BOOL, R_NONE, OPTTLSV1, 1}, + {"ssl_use_tlsv1", DT_BOOL, R_NONE, OPTTLSV1, "yes" }, /* ** .pp ** Availability: SSL or GNUTLS @@ -2482,8 +2615,8 @@ struct option_t MuttVars[] = { ** This variables specifies whether to attempt to use TLSv1 in the ** SSL authentication process. */ -#ifdef USE_GNUTLS - {"ssl_min_dh_prime_bits", DT_NUM, R_NONE, UL &SslDHPrimeBits, 0}, +# ifdef USE_GNUTLS + {"ssl_min_dh_prime_bits", DT_NUM, R_NONE, UL &SslDHPrimeBits, "0" }, /* ** .pp ** Availability: GNUTLS @@ -2493,7 +2626,7 @@ struct option_t MuttVars[] = { ** for use in any Diffie-Hellman key exchange. A value of 0 will use ** the default from the GNUTLS library. */ - {"ssl_ca_certificates_file", DT_PATH, R_NONE, UL &SslCACertFile, 0}, + {"ssl_ca_certificates_file", DT_PATH, R_NONE, UL &SslCACertFile, "" }, /* ** .pp ** This variable specifies a file containing trusted CA certificates. @@ -2502,87 +2635,71 @@ struct option_t MuttVars[] = { ** .pp ** Example: \fTset ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt\fP */ -#endif -#endif - {"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, 0}, +# endif /* USE_GNUTLS */ +# endif /* USE_SSL || USE_GNUTLS */ + {"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, "no" }, /* ** .pp ** Used in connection with the \fIpipe-message\fP command and the ``tag- ** prefix'' or ``tag-prefix-cond'' operators. ** If this variable is \fIunset\fP, when piping a list of - ** tagged messages Mutt-ng will concatenate the messages and will pipe them - ** as a single folder. When \fIset\fP, Mutt-ng will pipe the messages one by one. + ** tagged messages Madmutt will concatenate the messages and will pipe them + ** as a single folder. When \fIset\fP, Madmutt will pipe the messages one by one. ** In both cases the messages are piped in the current sorted order, ** and the ``$$pipe_sep'' separator is added after each message. */ - {"pipe_decode", DT_BOOL, R_NONE, OPTPIPEDECODE, 0}, + {"pipe_decode", DT_BOOL, R_NONE, OPTPIPEDECODE, "no" }, /* ** .pp ** Used in connection with the \fIpipe-message\fP command. When \fIunset\fP, - ** Mutt-ng will pipe the messages without any preprocessing. When \fIset\fP, Mutt-ng + ** Madmutt will pipe the messages without any preprocessing. When \fIset\fP, Madmutt ** will weed headers and will attempt to PGP/MIME decode the messages ** first. */ - {"pipe_sep", DT_STR, R_NONE, UL &PipeSep, UL "\n"}, + {"pipe_sep", DT_STR, R_NONE, UL &PipeSep, "\n"}, /* ** .pp ** The separator to add between messages when piping a list of tagged ** messages to an external Unix command. */ -#ifdef USE_POP - {"pop_authenticators", DT_STR, R_NONE, UL &PopAuthenticators, UL 0}, + {"pop_authenticators", DT_STR, R_NONE, UL &PopAuthenticators, "" }, /* ** .pp - ** Availability: POP - ** - ** .pp - ** This is a colon-delimited list of authentication methods Mutt-ng may - ** attempt to use to log in to an POP server, in the order Mutt-ng should + ** This is a colon-delimited list of authentication methods Madmutt may + ** attempt to use to log in to an POP server, in the order Madmutt should ** try them. Authentication methods are either ``\fTuser\fP'', ``\fTapop\fP'' ** or any SASL mechanism, eg ``\fTdigest-md5\fP'', ``\fTgssapi\fP'' or ``\fTcram-md5\fP''. ** .pp ** This parameter is case-insensitive. If this parameter is \fIunset\fP - ** (the default) Mutt-ng will try all available methods, in order from + ** (the default) Madmutt will try all available methods, in order from ** most-secure to least-secure. ** .pp ** Example: \fTset pop_authenticators="digest-md5:apop:user"\fP */ - {"pop_auth_try_all", DT_BOOL, R_NONE, OPTPOPAUTHTRYALL, 1}, + {"pop_auth_try_all", DT_BOOL, R_NONE, OPTPOPAUTHTRYALL, "yes" }, /* ** .pp - ** Availability: POP - ** - ** .pp - ** If \fIset\fP, Mutt-ng will try all available methods. When \fIunset\fP, Mutt-ng will + ** If \fIset\fP, Madmutt will try all available methods. When \fIunset\fP, Madmutt will ** only fall back to other authentication methods if the previous ** methods are unavailable. If a method is available but authentication - ** fails, Mutt-ng will not connect to the POP server. + ** fails, Madmutt will not connect to the POP server. */ {"pop_checkinterval", DT_SYN, R_NONE, UL "pop_mail_check", 0}, - {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, 60}, + {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" }, /* ** .pp - ** Availability: POP - ** - ** .pp - ** This variable configures how often (in seconds) POP should look for + ** This variable configures how often (in seconds) Madmutt should look for ** new mail. */ - {"pop_delete", DT_QUAD, R_NONE, OPT_POPDELETE, M_ASKNO}, + {"pop_delete", DT_QUAD, R_NONE, OPT_POPDELETE, "ask-no" }, /* ** .pp - ** Availability: POP - ** - ** .pp - ** If \fIset\fP, Mutt-ng will delete successfully downloaded messages from the POP - ** server when using the ``fetch-mail'' function. When \fIunset\fP, Mutt-ng will + ** If \fIset\fP, Madmutt will delete successfully downloaded messages from the POP + ** server when using the ``fetch-mail'' function. When \fIunset\fP, Madmutt will ** download messages but also leave them on the POP server. */ - {"pop_host", DT_STR, R_NONE, UL &PopHost, UL ""}, + {"pop_host", DT_STR, R_NONE, UL &PopHost, ""}, /* - ** .pp - ** Availability: POP - ** ** .pp ** The name of your POP server for the ``fetch-mail'' function. You ** can also specify an alternative port, username and password, i.e.: @@ -2593,64 +2710,50 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ - {"pop_last", DT_BOOL, R_NONE, OPTPOPLAST, 0}, + {"pop_last", DT_BOOL, R_NONE, OPTPOPLAST, "no" }, /* ** .pp - ** Availability: POP - ** - ** .pp - ** If this variable is \fIset\fP, Mutt-ng will try to use the ``\fTLAST\fP'' POP command + ** If this variable is \fIset\fP, Madmutt will try to use the ``\fTLAST\fP'' POP command ** for retrieving only unread messages from the POP server when using ** the ``fetch-mail'' function. */ - {"pop_reconnect", DT_QUAD, R_NONE, OPT_POPRECONNECT, M_ASKYES}, + {"pop_reconnect", DT_QUAD, R_NONE, OPT_POPRECONNECT, "ask-yes" }, /* ** .pp - ** Availability: POP - ** - ** .pp - ** Controls whether or not Mutt-ng will try to reconnect to a POP server when the + ** Controls whether or not Madmutt will try to reconnect to a POP server if the ** connection is lost. */ - {"pop_user", DT_STR, R_NONE, UL &PopUser, 0}, + {"pop_user", DT_STR, R_NONE, UL &PopUser, "" }, /* - ** .pp - ** Availability: POP - ** ** .pp ** Your login name on the POP server. ** .pp ** This variable defaults to your user name on the local machine. */ - {"pop_pass", DT_STR, R_NONE, UL &PopPass, UL ""}, + {"pop_pass", DT_STR, R_NONE, UL &PopPass, ""}, /* ** .pp - ** Availability: POP - ** - ** .pp - ** Specifies the password for your POP account. If \fIunset\fP, Mutt-ng will + ** Specifies the password for your POP account. If \fIunset\fP, Madmutt will ** prompt you for your password when you open POP mailbox. ** .pp ** \fBNote:\fP Storing passwords in a configuration file ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ -#endif /* USE_POP */ - {"post_indent_string", DT_STR, R_NONE, UL &PostIndentString, UL ""}, + {"post_indent_string", DT_STR, R_NONE, UL &PostIndentString, ""}, /* ** .pp - ** Similar to the ``$$attribution'' variable, Mutt-ng will append this + ** Similar to the ``$$attribution'' variable, Madmutt will append this ** string after the inclusion of a message which is being replied to. */ #ifdef USE_NNTP - {"post_moderated", DT_SYN, R_NONE, UL "nntp_post_moderated", 0 }, - {"nntp_post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, M_ASKYES}, + {"nntp_post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, "ask-yes" }, /* ** .pp ** Availability: NNTP ** ** .pp - ** If set to \fIyes\fP, Mutt-ng will post articles to newsgroup that have + ** If set to \fIyes\fP, Madmutt will post articles to newsgroup that have ** not permissions to post (e.g. moderated). ** .pp ** \fBNote:\fP if the newsserver @@ -2658,28 +2761,27 @@ struct option_t MuttVars[] = { ** posting will not have any effect. */ #endif - {"postpone", DT_QUAD, R_NONE, OPT_POSTPONE, M_ASKYES}, + {"postpone", DT_QUAD, R_NONE, OPT_POSTPONE, "ask-yes" }, /* ** .pp ** Controls whether or not messages are saved in the ``$$postponed'' ** mailbox when you elect not to send immediately. */ - {"postponed", DT_PATH, R_NONE, UL &Postponed, UL "~/postponed"}, + {"postponed", DT_PATH, R_NONE, UL &Postponed, "~/postponed"}, /* ** .pp - ** Mutt-ng allows you to indefinitely ``$postpone sending a message'' which - ** you are editing. When you choose to postpone a message, Mutt-ng saves it + ** Madmutt allows you to indefinitely ``$postpone sending a message'' which + ** you are editing. When you choose to postpone a message, Madmutt saves it ** in the mailbox specified by this variable. Also see the ``$$postpone'' ** variable. */ -#ifdef USE_SOCKET - {"preconnect", DT_STR, R_NONE, UL &Preconnect, UL 0}, + {"preconnect", DT_STR, R_NONE, UL &Preconnect, "" }, /* ** .pp - ** If \fIset\fP, a shell command to be executed if Mutt-ng fails to establish + ** If \fIset\fP, a shell command to be executed if Madmutt fails to establish ** a connection to the server. This is useful for setting up secure ** connections, e.g. with \fTssh(1)\fP. If the command returns a nonzero - ** status, Mutt-ng gives up opening the server. Example: + ** status, Madmutt gives up opening the server. Example: ** .pp ** \fTpreconnect="ssh -f -q -L 1234:mailhost.net:143 mailhost.net ** sleep 20 < /dev/null > /dev/null"\fP @@ -2690,20 +2792,19 @@ struct option_t MuttVars[] = { ** \fBNote:\fP For this example to work, you must be able to log in to the ** remote machine without having to enter a password. */ -#endif /* USE_SOCKET */ - {"print", DT_QUAD, R_NONE, OPT_PRINT, M_ASKNO}, + {"print", DT_QUAD, R_NONE, OPT_PRINT, "ask-no" }, /* ** .pp - ** Controls whether or not Mutt-ng really prints messages. + ** Controls whether or not Madmutt really prints messages. ** This is set to \fIask-no\fP by default, because some people ** accidentally hit ``p'' often. */ - {"print_command", DT_PATH, R_NONE, UL &PrintCmd, UL "lpr"}, + {"print_command", DT_PATH, R_NONE, UL &PrintCmd, "lpr"}, /* ** .pp ** This specifies the command pipe that should be used to print messages. */ - {"print_decode", DT_BOOL, R_NONE, OPTPRINTDECODE, 1}, + {"print_decode", DT_BOOL, R_NONE, OPTPRINTDECODE, "yes" }, /* ** .pp ** Used in connection with the print-message command. If this @@ -2714,7 +2815,7 @@ struct option_t MuttVars[] = { ** some advanced printer filter which is able to properly format ** e-mail messages for printing. */ - {"print_split", DT_BOOL, R_NONE, OPTPRINTSPLIT, 0}, + {"print_split", DT_BOOL, R_NONE, OPTPRINTSPLIT, "no" }, /* ** .pp ** Used in connection with the print-message command. If this option @@ -2727,44 +2828,44 @@ struct option_t MuttVars[] = { ** Those who use the \fTenscript(1)\fP program's mail-printing mode will ** most likely want to set this option. */ - {"prompt_after", DT_BOOL, R_NONE, OPTPROMPTAFTER, 1}, + {"prompt_after", DT_BOOL, R_NONE, OPTPROMPTAFTER, "yes" }, /* ** .pp ** If you use an \fIexternal\fP ``$$pager'', setting this variable will - ** cause Mutt-ng to prompt you for a command when the pager exits rather - ** than returning to the index menu. If \fIunset\fP, Mutt-ng will return to the + ** cause Madmutt to prompt you for a command when the pager exits rather + ** than returning to the index menu. If \fIunset\fP, Madmutt will return to the ** index menu when the external pager exits. */ - {"query_command", DT_PATH, R_NONE, UL &QueryCmd, UL ""}, + {"query_command", DT_PATH, R_NONE, UL &QueryCmd, ""}, /* ** .pp - ** This specifies the command that Mutt-ng will use to make external address + ** This specifies the command that Madmutt will use to make external address ** queries. The string should contain a \fT%s\fP, which will be substituted ** with the query string the user types. See ``$query'' for more ** information. */ - {"quit", DT_QUAD, R_NONE, OPT_QUIT, M_YES}, + {"quit", DT_QUAD, R_NONE, OPT_QUIT, "yes" }, /* ** .pp ** This variable controls whether ``quit'' and ``exit'' actually quit - ** from Mutt-ng. If it set to \fIyes\fP, they do quit, if it is set to \fIno\fP, they + ** 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, 1}, + {"quote_empty", DT_BOOL, R_NONE, OPTQUOTEEMPTY, "yes" }, /* ** .pp ** Controls whether or not empty lines will be quoted using ** ``$indent_string''. */ - {"quote_quoted", DT_BOOL, R_NONE, OPTQUOTEQUOTED, 0}, + {"quote_quoted", DT_BOOL, R_NONE, OPTQUOTEQUOTED, "no" }, /* ** .pp ** Controls how quoted lines will be quoted. If \fIset\fP, one quote ** character will be added to the end of existing prefix. Otherwise, ** quoted lines will be prepended by ``$indent_string''. */ - {"quote_regexp", DT_RX, R_PAGER, UL &QuoteRegexp, UL "^([ \t]*[|>:}#])+"}, + {"quote_regexp", DT_RX, R_PAGER, UL &QuoteRegexp, "^([ \t]*[|>:}#])+"}, /* ** .pp ** A regular expression used in the internal-pager to determine quoted @@ -2775,12 +2876,12 @@ struct option_t MuttVars[] = { ** matches \fIexactly\fP the quote characters at the beginning of quoted ** lines. */ - {"read_inc", DT_NUM, R_NONE, UL &ReadInc, 10}, + {"read_inc", DT_NUM, R_NONE, UL &ReadInc, "10" }, /* ** .pp - ** If set to a value greater than 0, Mutt-ng will display which message it + ** If set to a value greater than 0, Madmutt will display which message it ** is currently on when reading a mailbox. The message is printed after - ** \fIread_inc\fP messages have been read (e.g., if set to 25, Mutt-ng will + ** \fIread_inc\fP messages have been read (e.g., if set to 25, Madmutt will ** print a message when it reads message 25, and then again when it gets ** to message 50). This variable is meant to indicate progress when ** reading large mailboxes which may take some time. @@ -2789,12 +2890,12 @@ struct option_t MuttVars[] = { ** .pp ** Also see the ``$$write_inc'' variable. */ - {"read_only", DT_BOOL, R_NONE, OPTREADONLY, 0}, + {"read_only", DT_BOOL, R_NONE, OPTREADONLY, "no" }, /* ** .pp ** If set, all folders are opened in read-only mode. */ - {"realname", DT_STR, R_BOTH, UL &Realname, 0}, + {"realname", DT_STR, R_BOTH, UL &Realname, "" }, /* ** .pp ** This variable specifies what ``real'' or ``personal'' name should be used @@ -2806,16 +2907,16 @@ struct option_t MuttVars[] = { ** variable will \fInot\fP be used when the user has set a real name ** in the $$from variable. */ - {"recall", DT_QUAD, R_NONE, OPT_RECALL, M_ASKYES}, + {"recall", DT_QUAD, R_NONE, OPT_RECALL, "ask-yes" }, /* ** .pp - ** Controls whether or not Mutt-ng recalls postponed messages + ** Controls whether or not Madmutt recalls postponed messages ** when composing a new message. Also see ``$$postponed''. ** .pp ** Setting this variable to \fIyes\fP is not generally useful, and thus not ** recommended. */ - {"record", DT_PATH, R_NONE, UL &Outbox, UL ""}, + {"record", DT_PATH, R_NONE, UL &Outbox, ""}, /* ** .pp ** This specifies the file into which your outgoing messages should be @@ -2826,24 +2927,24 @@ struct option_t MuttVars[] = { ** The value of \fI$$record\fP is overridden by the ``$$force_name'' and ** ``$$save_name'' variables, and the ``$fcc-hook'' command. */ - {"reply_regexp", DT_RX, R_INDEX|R_RESORT, UL &ReplyRegexp, UL "^(re([\\[0-9\\]+])*|aw):[ \t]*"}, + {"reply_regexp", DT_RX, R_INDEX|R_RESORT, UL &ReplyRegexp, "^(re([\\[0-9\\]+])*|aw):[ \t]*"}, /* ** .pp ** A regular expression used to recognize reply messages when threading ** and replying. The default value corresponds to the English ``Re:'' and ** the German ``Aw:''. */ - {"reply_self", DT_BOOL, R_NONE, OPTREPLYSELF, 0}, + {"reply_self", DT_BOOL, R_NONE, OPTREPLYSELF, "no" }, /* ** .pp - ** If \fIunset\fP and you are replying to a message sent by you, Mutt-ng will + ** If \fIunset\fP and you are replying to a message sent by you, Madmutt will ** assume that you want to reply to the recipients of that message rather ** than to yourself. */ - {"reply_to", DT_QUAD, R_NONE, OPT_REPLYTO, M_ASKYES}, + {"reply_to", DT_QUAD, R_NONE, OPT_REPLYTO, "ask-yes" }, /* ** .pp - ** If \fIset\fP, when replying to a message, Mutt-ng will use the address listed + ** If \fIset\fP, when replying to a message, Madmutt will use the address listed ** in the ``\fTReply-To:\fP'' header field as the recipient of the reply. If \fIunset\fP, ** it will use the address in the ``\fTFrom:\fP'' header field instead. ** .pp @@ -2852,17 +2953,17 @@ struct option_t MuttVars[] = { ** header field to the list address and you want to send a private ** message to the author of a message. */ - {"resolve", DT_BOOL, R_NONE, OPTRESOLVE, 1}, + {"resolve", DT_BOOL, R_NONE, OPTRESOLVE, "yes" }, /* ** .pp ** When set, the cursor will be automatically advanced to the next ** (possibly undeleted) message whenever a command that modifies the ** current message is executed. */ - {"reverse_alias", DT_BOOL, R_BOTH, OPTREVALIAS, 0}, + {"reverse_alias", DT_BOOL, R_BOTH, OPTREVALIAS, "no" }, /* ** .pp - ** This variable controls whether or not Mutt-ng will display the ``personal'' + ** This variable controls whether or not Madmutt will display the ``personal'' ** name from your aliases in the index menu if it finds an alias that ** matches the message's sender. For example, if you have the following ** alias: @@ -2877,7 +2978,7 @@ struct option_t MuttVars[] = { ** ``abd30425@somewhere.net.'' This is useful when the person's e-mail ** address is not human friendly (like CompuServe addresses). */ - {"reverse_name", DT_BOOL, R_BOTH, OPTREVNAME, 0}, + {"reverse_name", DT_BOOL, R_BOTH, OPTREVNAME, "no" }, /* ** .pp ** It may sometimes arrive that you receive mail to a certain machine, @@ -2889,19 +2990,19 @@ struct option_t MuttVars[] = { ** used doesn't match your alternates, the \fTFrom:\fP line will use ** your address on the current machine. */ - {"reverse_realname", DT_BOOL, R_BOTH, OPTREVREAL, 1}, + {"reverse_realname", DT_BOOL, R_BOTH, OPTREVREAL, "yes" }, /* ** .pp ** This variable fine-tunes the behaviour of the $reverse_name feature. - ** When it is \fIset\fP, Mutt-ng will use the address from incoming messages as-is, - ** possibly including eventual real names. When it is \fIunset\fP, Mutt-ng will + ** When it is \fIset\fP, Madmutt will use the address from incoming messages as-is, + ** possibly including eventual real names. When it is \fIunset\fP, Madmutt will ** override any such real names with the setting of the $realname variable. */ - {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0}, + {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, "no" }, /* ** .pp - ** When this variable is \fIset\fP, Mutt-ng will decode RFC-2047-encoded MIME - ** parameters. You want to set this variable when Mutt-ng suggests you + ** When this variable is \fIset\fP, Madmutt will decode RFC-2047-encoded MIME + ** parameters. You want to set this variable when Madmutt suggests you ** to save attachments to files named like this: ** .pp ** \fT=?iso-8859-1?Q?file=5F=E4=5F991116=2Ezip?=\fP @@ -2914,27 +3015,27 @@ struct option_t MuttVars[] = { ** wild. ** .pp ** Also note that setting this parameter will \fInot\fP have the effect - ** that Mutt-ng \fIgenerates\fP this kind of encoding. Instead, Mutt-ng will + ** that Madmutt \fIgenerates\fP this kind of encoding. Instead, Madmutt will ** unconditionally use the encoding specified in RFC 2231. */ - {"save_address", DT_BOOL, R_NONE, OPTSAVEADDRESS, 0}, + {"save_address", DT_BOOL, R_NONE, OPTSAVEADDRESS, "no" }, /* ** .pp - ** If \fIset\fP, Mutt-ng will take the sender's full address when choosing a + ** If \fIset\fP, Madmutt will take the sender's full address when choosing a ** default folder for saving a mail. If ``$$save_name'' or ``$$force_name'' ** is \fIset\fP too, the selection of the fcc folder will be changed as well. */ - {"save_empty", DT_BOOL, R_NONE, OPTSAVEEMPTY, 1}, + {"save_empty", DT_BOOL, R_NONE, OPTSAVEEMPTY, "yes" }, /* ** .pp ** When \fIunset\fP, mailboxes which contain no saved messages will be removed ** when closed (the exception is ``$$spoolfile'' which is never removed). ** If \fIset\fP, mailboxes are never removed. ** .pp - ** \fBNote:\fP This only applies to mbox and MMDF folders, Mutt-ng does not + ** \fBNote:\fP This only applies to mbox and MMDF folders, Madmutt does not ** delete MH and Maildir directories. */ - {"save_name", DT_BOOL, R_NONE, OPTSAVENAME, 0}, + {"save_name", DT_BOOL, R_NONE, OPTSAVENAME, "no" }, /* ** .pp ** This variable controls how copies of outgoing messages are saved. @@ -2947,7 +3048,7 @@ struct option_t MuttVars[] = { ** .pp ** Also see the ``$$force_name'' variable. */ - {"score", DT_BOOL, R_NONE, OPTSCORE, 1}, + {"score", DT_BOOL, R_NONE, OPTSCORE, "yes" }, /* ** .pp ** When this variable is \fIunset\fP, scoring is turned off. This can @@ -2955,32 +3056,32 @@ struct option_t MuttVars[] = { ** ``$$score_threshold_delete'' variable and friends are used. ** */ - {"score_threshold_delete", DT_NUM, R_NONE, UL &ScoreThresholdDelete, UL -1}, + {"score_threshold_delete", DT_NUM, R_NONE, UL &ScoreThresholdDelete, "-1" }, /* ** .pp ** Messages which have been assigned a score equal to or lower than the value - ** of this variable are automatically marked for deletion by Mutt-ng. Since - ** Mutt-ng scores are always greater than or equal to zero, the default setting + ** of this variable are automatically marked for deletion by Madmutt. Since + ** Madmutt scores are always greater than or equal to zero, the default setting ** of this variable will never mark a message for deletion. */ - {"score_threshold_flag", DT_NUM, R_NONE, UL &ScoreThresholdFlag, 9999}, + {"score_threshold_flag", DT_NUM, R_NONE, UL &ScoreThresholdFlag, "9999" }, /* ** .pp ** Messages which have been assigned a score greater than or equal to this ** variable's value are automatically marked ``flagged''. */ - {"score_threshold_read", DT_NUM, R_NONE, UL &ScoreThresholdRead, UL -1}, + {"score_threshold_read", DT_NUM, R_NONE, UL &ScoreThresholdRead, "-1" }, /* ** .pp ** Messages which have been assigned a score equal to or lower than the value - ** of this variable are automatically marked as read by Mutt-ng. Since - ** Mutt-ng scores are always greater than or equal to zero, the default setting + ** of this variable are automatically marked as read by Madmutt. Since + ** 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, UL "us-ascii:iso-8859-1:utf-8"}, + {"send_charset", DT_STR, R_NONE, UL &SendCharset, "us-ascii:iso-8859-1:utf-8"}, /* ** .pp - ** A list of character sets for outgoing messages. Mutt-ng will use the + ** 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 @@ -2988,20 +3089,20 @@ struct option_t MuttVars[] = { ** \fTiso-8859-2\fP, \fTkoi8-r\fP or \fTiso-2022-jp\fP) either ** instead of or after \fTiso-8859-1\fP. */ - {"sendmail", DT_PATH, R_NONE, UL &Sendmail, UL SENDMAIL " -oem -oi"}, + {"sendmail", DT_PATH, R_NONE, UL &Sendmail, SENDMAIL " -oem -oi"}, /* ** .pp - ** Specifies the program and arguments used to deliver mail sent by Mutt-ng. - ** Mutt-ng expects that the specified program interprets additional + ** Specifies the program and arguments used to deliver mail sent by Madmutt. + ** Madmutt expects that the specified program interprets additional ** arguments as recipient addresses. */ - {"sendmail_wait", DT_NUM, R_NONE, UL &SendmailWait, 0}, + {"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 - ** Mutt-ng interprets the value of this variable as follows: + ** 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 @@ -3012,15 +3113,14 @@ struct option_t MuttVars[] = { ** process will be put in a temporary file. If there is some error, you ** will be informed as to where to find the output. */ - {"shell", DT_PATH, R_NONE, UL &Shell, 0}, + {"shell", DT_PATH, R_NONE, UL &Shell, "" }, /* ** .pp ** Command to use when spawning a subshell. By default, the user's login ** shell from \fT/etc/passwd\fP is used. */ #ifdef USE_NNTP - {"save_unsubscribed", DT_SYN, R_NONE, UL "nntp_save_unsubscribed", 0 }, - {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, 0}, + {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, "no" }, /* ** .pp ** Availability: NNTP @@ -3031,8 +3131,7 @@ struct option_t MuttVars[] = { */ #endif #ifdef USE_NNTP - {"show_new_news", DT_SYN, R_NONE, UL "nntp_show_new_news", 0 }, - {"nntp_show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, 1}, + {"nntp_show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, "yes" }, /* ** .pp ** Availability: NNTP @@ -3043,8 +3142,7 @@ struct option_t MuttVars[] = { ** Also controls whether or not the number of new articles of subscribed ** newsgroups will be checked. */ - {"show_only_unread", DT_SYN, R_NONE, UL "nntp_show_only_unread", 0 }, - {"nntp_show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, 0}, + {"nntp_show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, "no" }, /* ** .pp ** Availability: NNTP @@ -3054,7 +3152,7 @@ struct option_t MuttVars[] = { ** will be displayed in the newsgroup browser. */ #endif - {"sig_dashes", DT_BOOL, R_NONE, OPTSIGDASHES, 1}, + {"sig_dashes", DT_BOOL, R_NONE, OPTSIGDASHES, "yes" }, /* ** .pp ** If set, a line containing ``\fT-- \fP'' (dash, dash, space) @@ -3063,10 +3161,10 @@ struct option_t MuttVars[] = { ** contains just your name. The reason for this is because many software ** packages use ``\fT-- \n\fP'' to detect your signature. ** .pp - ** For example, Mutt-ng has the ability to highlight + ** For example, Madmutt has the ability to highlight ** the signature in a different color in the builtin pager. */ - {"sig_on_top", DT_BOOL, R_NONE, OPTSIGONTOP, 0}, + {"sig_on_top", DT_BOOL, R_NONE, OPTSIGONTOP, "no" }, /* ** .pp ** If \fIset\fP, the signature will be included before any quoted or forwarded @@ -3074,7 +3172,7 @@ struct option_t MuttVars[] = { ** unless you really know what you are doing, and are prepared to take ** some heat from netiquette guardians. */ - {"signature", DT_PATH, R_NONE, UL &Signature, UL "~/.signature"}, + {"signature", DT_PATH, R_NONE, UL &Signature, "~/.signature"}, /* ** .pp ** Specifies the filename of your signature, which is appended to all @@ -3082,7 +3180,7 @@ struct option_t MuttVars[] = { ** assumed that filename is a shell command and input should be read from ** its stdout. */ - {"signoff_string", DT_STR, R_NONE, UL &SignOffString, UL 0}, + {"signoff_string", DT_STR, R_NONE, UL &SignOffString, "" }, /* ** .pp ** If \fIset\fP, this string will be inserted before the signature. This is useful @@ -3092,20 +3190,20 @@ struct option_t MuttVars[] = { ** witty quotes into your mails, better use a signature file instead of ** the signoff string. */ - {"simple_search", DT_STR, R_NONE, UL &SimpleSearch, UL "~f %s | ~s %s"}, + {"simple_search", DT_STR, R_NONE, UL &SimpleSearch, "~f %s | ~s %s"}, /* ** .pp - ** Specifies how Mutt-ng should expand a simple search into a real search + ** Specifies how Madmutt should expand a simple search into a real search ** pattern. A simple search is one that does not contain any of the ~ ** operators. See ``$patterns'' for more information on search patterns. ** .pp - ** For example, if you simply type ``joe'' at a search or limit prompt, Mutt-ng + ** For example, if you simply type ``joe'' at a search or limit prompt, Madmutt ** will automatically expand it to the value specified by this variable. ** For the default value it would be: ** .pp ** \fT~f joe | ~s joe\fP */ - {"smart_wrap", DT_BOOL, R_PAGER, OPTWRAP, 1}, + {"smart_wrap", DT_BOOL, R_PAGER, OPTWRAP, "yes" }, /* ** .pp ** Controls the display of lines longer than the screen width in the @@ -3113,14 +3211,14 @@ struct option_t MuttVars[] = { ** If \fIunset\fP, lines are simply wrapped at the screen edge. Also see the ** ``$$markers'' variable. */ - {"smileys", DT_RX, R_PAGER, UL &Smileys, UL "(>From )|(:[-^]?[][)(><}{|/DP])"}, + {"smileys", DT_RX, R_PAGER, UL &Smileys, "(>From )|(:[-^]?[][)(><}{|/DP])"}, /* ** .pp ** The \fIpager\fP uses this variable to catch some common false ** positives of ``$$quote_regexp'', most notably smileys in the beginning ** of a line */ - {"sleep_time", DT_NUM, R_NONE, UL &SleepTime, 1}, + {"sleep_time", DT_NUM, R_NONE, UL &SleepTime, "1" }, /* ** .pp ** Specifies time, in seconds, to pause while displaying certain informational @@ -3128,7 +3226,7 @@ struct option_t MuttVars[] = { ** messages from the current folder. The default is to pause one second, so ** a value of zero for this option suppresses the pause. */ - {"sort", DT_SORT, R_INDEX|R_RESORT, UL &Sort, SORT_DATE}, + {"sort", DT_SORT, R_INDEX|R_RESORT, UL &Sort, "date" }, /* ** .pp ** Specifies how to sort messages in the \fIindex\fP menu. Valid values @@ -3150,7 +3248,7 @@ struct option_t MuttVars[] = { ** You may optionally use the ``reverse-'' prefix to specify reverse sorting ** order (example: \fTset sort=reverse-date-sent\fP). */ - {"sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS}, + {"sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, "alias" }, /* ** .pp ** Specifies how the entries in the ``alias'' menu are sorted. The @@ -3162,13 +3260,13 @@ struct option_t MuttVars[] = { ** . unsorted (leave in order specified in .muttrc) ** .te */ - {"sort_aux", DT_SORT|DT_SORT_AUX, R_INDEX|R_RESORT_BOTH, UL &SortAux, SORT_DATE}, + {"sort_aux", DT_SORT|DT_SORT_AUX, R_INDEX|R_RESORT_BOTH, UL &SortAux, "date" }, /* ** .pp ** When sorting by threads, this variable controls how threads are sorted ** in relation to other threads, and how the branches of the thread trees ** are sorted. This can be set to any value that ``$$sort'' can, except - ** threads (in that case, Mutt-ng will just use date-sent). You can also + ** threads (in that case, Madmutt will just use date-sent). You can also ** specify the ``last-'' prefix in addition to ``reverse-'' prefix, but last- ** must come after reverse-. The last- prefix causes messages to be ** sorted against its siblings by which has the last descendant, using @@ -3182,7 +3280,7 @@ struct option_t MuttVars[] = { ** (which is not the right thing to do, but kept to not break any existing ** configuration setting). */ - {"sort_browser", DT_SORT|DT_SORT_BROWSER, R_NONE, UL &BrowserSort, SORT_ALPHA}, + {"sort_browser", DT_SORT|DT_SORT_BROWSER, R_NONE, UL &BrowserSort, "alpha" }, /* ** .pp ** Specifies how to sort entries in the file browser. By default, the @@ -3198,19 +3296,19 @@ struct option_t MuttVars[] = { ** You may optionally use the ``reverse-'' prefix to specify reverse sorting ** order (example: \fTset sort_browser=reverse-date\fP). */ - {"sort_re", DT_BOOL, R_INDEX|R_RESORT|R_RESORT_INIT, OPTSORTRE, 1}, + {"sort_re", DT_BOOL, R_INDEX|R_RESORT|R_RESORT_INIT, OPTSORTRE, "yes" }, /* ** .pp ** This variable is only useful when sorting by threads with ** ``$$strict_threads'' \fIunset\fP. In that case, it changes the heuristic - ** Mutt-ng uses to thread messages by subject. With $$sort_re \fIset\fP, - ** Mutt-ng will only attach a message as the child of another message by + ** Madmutt uses to thread messages by subject. With $$sort_re \fIset\fP, + ** Madmutt will only attach a message as the child of another message by ** subject if the subject of the child message starts with a substring ** matching the setting of ``$$reply_regexp''. With $$sort_re \fIunset\fP, - ** Mutt-ng will attach the message whether or not this is the case, + ** 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, UL ","}, + {"spam_separator", DT_STR, R_NONE, UL &SpamSep, ","}, /* ** .pp ** ``$spam_separator'' controls what happens when multiple spam headers @@ -3219,15 +3317,15 @@ struct option_t MuttVars[] = { ** match will append to the previous, using ``$spam_separator'' as a ** separator. */ - {"spoolfile", DT_PATH, R_NONE, UL &Spoolfile, 0}, + {"spoolfile", DT_PATH, R_NONE, UL &Spoolfile, "" }, /* ** .pp - ** If your spool mailbox is in a non-default place where Mutt-ng cannot find - ** it, you can specify its location with this variable. Mutt-ng will + ** If your spool mailbox is in a non-default place where Madmutt cannot find + ** it, you can specify its location with this variable. Madmutt will ** automatically set this variable to the value of the environment ** variable $$$MAIL if it is not set. */ - {"status_chars", DT_STR, R_BOTH, UL &StChars, UL "-*%A"}, + {"status_chars", DT_STR, R_BOTH, UL &StChars, "-*%A"}, /* ** .pp ** Controls the characters used by the ``\fT%r\fP'' indicator in @@ -3241,7 +3339,7 @@ struct option_t MuttVars[] = { ** opened in attach-message mode (Certain operations like composing ** a new mail, replying, forwarding, etc. are not permitted in this mode). */ - {"status_format", DT_STR, R_BOTH, UL &Status, UL "-%r-Mutt-ng: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---"}, + {"status_format", DT_STR, R_BOTH, UL &Status, "-%r-Madmutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---"}, /* ** .pp ** Controls the format of the status line displayed in the \fIindex\fP @@ -3270,7 +3368,7 @@ struct option_t MuttVars[] = { ** .dt %S .dd current aux sorting method ($$sort_aux) ** .dt %t .dd number of tagged messages * ** .dt %u .dd number of unread messages * - ** .dt %v .dd Mutt-ng version string + ** .dt %v .dd Madmutt version string ** .dt %V .dd currently active limit pattern, if any * ** .dt %>X .dd right justify the rest of the string and pad with "X" ** .dt %|X .dd pad to the end of the line with "X" @@ -3310,17 +3408,17 @@ struct option_t MuttVars[] = { ** .pp ** \fT%_h\fP ** .pp - ** If you prefix the sequence character with a colon (\fT:\fP) character, Mutt-ng + ** If you prefix the sequence character with a colon (\fT:\fP) character, Madmutt ** will replace any dots in the expansion by underscores. This might be helpful ** with IMAP folders that don't like dots in folder names. */ - {"status_on_top", DT_BOOL, R_BOTH, OPTSTATUSONTOP, 0}, + {"status_on_top", DT_BOOL, R_BOTH, OPTSTATUSONTOP, "no" }, /* ** .pp ** Setting this variable causes the ``status bar'' to be displayed on ** the first line of the screen rather than near the bottom. */ - {"strict_mailto", DT_BOOL, R_NONE, OPTSTRICTMAILTO, 1}, + {"strict_mailto", DT_BOOL, R_NONE, OPTSTRICTMAILTO, "yes" }, /* ** ** .pp @@ -3329,12 +3427,12 @@ struct option_t MuttVars[] = { ** if ``$$edit_headers'' is unset. ** ** .pp - ** If this variable is \fIset\fP, mutt-ng is strict and allows anything to be + ** If this variable is \fIset\fP, Madmutt is strict and allows anything to be ** changed. If it's \fIunset\fP, all headers given will be prefixed with ** ``X-Mailto-'' and the message including headers will be shown in the editor ** regardless of what ``$$edit_headers'' is set to. **/ - {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, 1}, + {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "yes" }, /* ** .pp ** When \fIunset\fP, non MIME-compliant messages that doesn't have any @@ -3347,7 +3445,7 @@ struct option_t MuttVars[] = { ** and *text to a single space to prevent the display of MIME-encoded ** ``\fTSubject:\fP'' header field from being devided into multiple lines. */ - {"strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, 0}, + {"strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, "no" }, /* ** .pp ** If \fIset\fP, threading will only make use of the ``\fTIn-Reply-To:\fP'' and @@ -3355,53 +3453,55 @@ struct option_t MuttVars[] = { ** default, messages with the same subject are grouped together in ** ``pseudo threads.'' This may not always be desirable, such as in a ** personal mailbox where you might have several unrelated messages with - ** the subject ``hi'' which will get grouped together. + ** the subject ``hi'' which will get grouped together. See also + ** ``$$sort_re'' for a less drastic way of controlling this + ** behaviour. */ - {"strip_was", DT_BOOL, R_NONE, OPTSTRIPWAS, 0}, + {"strip_was", DT_BOOL, R_NONE, OPTSTRIPWAS, "no" }, /** ** .pp - ** When \fIset\fP, mutt-ng will remove the trailing part of the ``\fTSubject:\fP'' + ** When \fIset\fP, Madmutt will remove the trailing part of the ``\fTSubject:\fP'' ** line which matches $$strip_was_regex when replying. This is useful to ** properly react on subject changes and reduce ``subject noise.'' (esp. in Usenet) **/ - {"strip_was_regex", DT_RX, R_NONE, UL &StripWasRegexp, UL "\\([Ww][Aa][RrSs]: .*\\)[ ]*$"}, + {"strip_was_regex", DT_RX, R_NONE, UL &StripWasRegexp, "\\([Ww][Aa][RrSs]: .*\\)[ ]*$"}, /** ** .pp - ** When non-empty and $$strip_was is \fIset\fP, mutt-ng will remove this + ** When non-empty and $$strip_was is \fIset\fP, Madmutt will remove this ** trailing part of the ``Subject'' line when replying if it won't be empty ** afterwards. **/ - {"stuff_quoted", DT_BOOL, R_BOTH, OPTSTUFFQUOTED, 0}, + {"stuff_quoted", DT_BOOL, R_BOTH, OPTSTUFFQUOTED, "no" }, /* ** .pp ** If \fIset\fP, attachments with flowed format will have their quoting ``stuffed'', ** i.e. a space will be inserted between the quote characters and the actual ** text. */ - {"suspend", DT_BOOL, R_NONE, OPTSUSPEND, 1}, + {"suspend", DT_BOOL, R_NONE, OPTSUSPEND, "yes" }, /* ** .pp - ** When \fIunset\fP, Mutt-ng won't stop when the user presses the terminal's - ** \fIsusp\fP key, usually \fTCTRL+Z\fP. This is useful if you run Mutt-ng - ** inside an xterm using a command like ``\fTxterm -e muttng\fP.'' + ** When \fIunset\fP, Madmutt won't stop when the user presses the terminal's + ** \fIsusp\fP key, usually \fTCTRL+Z\fP. This is useful if you run Madmutt + ** inside an xterm using a command like ``\fTxterm -e madmutt\fP.'' */ - {"text_flowed", DT_BOOL, R_NONE, OPTTEXTFLOWED, 0}, + {"text_flowed", DT_BOOL, R_NONE, OPTTEXTFLOWED, "no" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will generate \fTtext/plain; format=flowed\fP attachments. + ** When \fIset\fP, Madmutt will generate \fTtext/plain; format=flowed\fP attachments. ** This format is easier to handle for some mailing software, and generally ** just looks like ordinary text. To actually make use of this format's ** features, you'll need support in your editor. ** .pp ** Note that $$indent_string is ignored when this option is set. */ - {"thread_received", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTTHREADRECEIVED, 0}, + {"thread_received", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTTHREADRECEIVED, "no" }, /* ** .pp - ** When \fIset\fP, Mutt-ng uses the date received rather than the date sent + ** When \fIset\fP, Madmutt uses the date received rather than the date sent ** to thread messages by subject. */ - {"thorough_search", DT_BOOL, R_NONE, OPTTHOROUGHSRC, 0}, + {"thorough_search", DT_BOOL, R_NONE, OPTTHOROUGHSRC, "no" }, /* ** .pp ** Affects the \fT~b\fP and \fT~h\fP search operations described in @@ -3409,29 +3509,29 @@ struct option_t MuttVars[] = { ** messages to be searched are decoded before searching. If \fIunset\fP, ** messages are searched as they appear in the folder. */ - {"tilde", DT_BOOL, R_PAGER, OPTTILDE, 0}, + {"tilde", DT_BOOL, R_PAGER, OPTTILDE, "no" }, /* ** .pp ** When \fIset\fP, the internal-pager will pad blank lines to the bottom of the ** screen with a tilde (~). */ - {"timeout", DT_NUM, R_NONE, UL &Timeout, 600}, + {"timeout", DT_NUM, R_NONE, UL &Timeout, "600" }, /* ** .pp - ** This variable controls the \fInumber of seconds\fP Mutt-ng will wait + ** This variable controls the \fInumber of seconds\fP Madmutt will wait ** for a key to be pressed in the main menu before timing out and - ** checking for new mail. A value of zero or less will cause Mutt-ng + ** checking for new mail. A value of zero or less will cause Madmutt ** to never time out. */ - {"tmpdir", DT_PATH, R_NONE, UL &Tempdir, 0}, + {"tmpdir", DT_PATH, R_NONE, UL &Tempdir, "" }, /* ** .pp - ** This variable allows you to specify where Mutt-ng will place its + ** 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, UL " +TCFL"}, + {"to_chars", DT_STR, R_BOTH, UL &Tochars, " +TCFL"}, /* ** .pp ** Controls the character used to indicate mail addressed to you. The @@ -3445,7 +3545,7 @@ struct option_t MuttVars[] = { ** by \fIyou\fP. The sixth character is used to indicate when a mail ** was sent to a mailing-list you're subscribe to (default: L). */ - {"trash", DT_PATH, R_NONE, UL &TrashPath, 0}, + {"trash", DT_PATH, R_NONE, UL &TrashPath, "" }, /* ** .pp ** If \fIset\fP, this variable specifies the path of the trash folder where the @@ -3455,11 +3555,10 @@ struct option_t MuttVars[] = { ** \fBNote\fP: When you delete a message in the trash folder, it is really ** deleted, so that there is no way to recover mail. */ -#ifdef USE_SOCKET - {"tunnel", DT_STR, R_NONE, UL &Tunnel, UL 0}, + {"tunnel", DT_STR, R_NONE, UL &Tunnel, "" }, /* ** .pp - ** Setting this variable will cause Mutt-ng to open a pipe to a command + ** Setting this variable will cause Madmutt to open a pipe to a command ** instead of a raw socket. You may be able to use this to set up ** preauthenticated connections to your IMAP/POP3 server. Example: ** .pp @@ -3468,77 +3567,73 @@ struct option_t MuttVars[] = { ** \fBNote:\fP For this example to work you must be able to log in to the remote ** machine without having to enter a password. */ -#endif - {"umask", DT_NUM, R_NONE, UL &Umask, 0077}, + {"umask", DT_NUM, R_NONE, UL &Umask, "0077" }, /* ** .pp - ** This sets the umask that will be used by Mutt-ng when creating all + ** 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, 0}, + {"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 you may not be able to send mail. + ** 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, Mutt-ng will invoke ``$$sendmail'' with the \fT-B8BITMIME\fP - ** flag when sending 8-bit messages to enable ESMTP negotiation. + ** 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, 1}, + {"use_domain", DT_BOOL, R_NONE, OPTUSEDOMAIN, "yes" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will qualify all local addresses (ones without the + ** 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, 1}, + {"use_from", DT_BOOL, R_NONE, OPTUSEFROM, "yes" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will generate the ``\fTFrom:\fP'' header field when + ** When \fIset\fP, Madmutt will generate the ``\fTFrom:\fP'' header field when ** sending messages. If \fIunset\fP, no ``\fTFrom:\fP'' header field will be ** generated unless the user explicitly sets one using the ``$my_hdr'' ** command. */ #ifdef HAVE_LIBIDN - {"use_idn", DT_BOOL, R_BOTH, OPTUSEIDN, 1}, + {"use_idn", DT_BOOL, R_BOTH, OPTUSEIDN, "yes" }, /* ** .pp ** Availability: IDN ** ** .pp - ** When \fIset\fP, Mutt-ng will show you international domain names decoded. + ** When \fIset\fP, Madmutt will show you international domain names decoded. ** .pp ** \fBNote:\fP You can use IDNs for addresses even if this is \fIunset\fP. ** This variable only affects decoding. */ #endif /* HAVE_LIBIDN */ #ifdef HAVE_GETADDRINFO - {"use_ipv6", DT_BOOL, R_NONE, OPTUSEIPV6, 1}, + {"use_ipv6", DT_BOOL, R_NONE, OPTUSEIPV6, "yes" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will look for IPv6 addresses of hosts it tries to - ** contact. If this option is \fIunset\fP, Mutt-ng will restrict itself to IPv4 addresses. + ** When \fIset\fP, Madmutt will look for IPv6 addresses of hosts it tries to + ** contact. If this option is \fIunset\fP, Madmutt will restrict itself to IPv4 addresses. ** Normally, the default should work. */ #endif /* HAVE_GETADDRINFO */ - {"user_agent", DT_BOOL, R_NONE, OPTXMAILER, 1}, + {"user_agent", DT_SYN, R_NONE, UL "agent_string", 0 }, + {"agent_string", DT_BOOL, R_NONE, OPTXMAILER, "yes" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will add a ``\fTUser-Agent:\fP'' header to outgoing - ** messages, indicating which version of Mutt-ng was used for composing + ** When \fIset\fP, Madmutt will add a ``\fTUser-Agent:\fP'' header to outgoing + ** messages, indicating which version of Madmutt was used for composing ** them. */ - {"visual", DT_PATH, R_NONE, UL &Visual, 0}, - /* - ** .pp - ** Specifies the visual editor to invoke when the \fI~v\fP command is - ** given in the builtin editor. - */ - {"wait_key", DT_BOOL, R_NONE, OPTWAITKEY, 1}, + {"wait_key", DT_BOOL, R_NONE, OPTWAITKEY, "yes" }, /* ** .pp - ** Controls whether Mutt-ng will ask you to press a key after \fIshell- + ** Controls whether Madmutt will ask you to press a key after \fIshell- ** escape\fP, \fIpipe-message\fP, \fIpipe-entry\fP, \fIprint-message\fP, ** and \fIprint-entry\fP commands. ** .pp @@ -3546,16 +3641,16 @@ struct option_t MuttVars[] = { ** that the corresponding mailcap entry has a \fTneedsterminal\fP flag, ** and the external program is interactive. ** .pp - ** When \fIset\fP, Mutt-ng will always ask for a key. When \fIunset\fP, Mutt-ng will wait + ** When \fIset\fP, Madmutt will always ask for a key. When \fIunset\fP, Madmutt will wait ** for a key only if the external command returned a non-zero status. */ - {"weed", DT_BOOL, R_NONE, OPTWEED, 1}, + {"weed", DT_BOOL, R_NONE, OPTWEED, "yes" }, /* ** .pp - ** When \fIset\fP, Mutt-ng will weed headers when displaying, forwarding, + ** When \fIset\fP, Madmutt will weed headers when displaying, forwarding, ** printing, or replying to messages. */ - {"wrap_search", DT_BOOL, R_NONE, OPTWRAPSEARCH, 1}, + {"wrap_search", DT_BOOL, R_NONE, OPTWRAPSEARCH, "yes" }, /* ** .pp ** Controls whether searches wrap around the end of the mailbox. @@ -3563,13 +3658,13 @@ struct option_t MuttVars[] = { ** When \fIset\fP, searches will wrap around the first (or last) message. When ** \fIunset\fP, searches will not wrap. */ - {"wrapmargin", DT_NUM, R_PAGER, UL &WrapMargin, 0}, + {"wrapmargin", DT_NUM, R_PAGER, UL &WrapMargin, "0" }, /* ** .pp ** Controls the size of the margin remaining at the right side of - ** the terminal when Mutt-ng's pager does smart wrapping. + ** the terminal when Madmutt's pager does smart wrapping. */ - {"write_inc", DT_NUM, R_NONE, UL &WriteInc, 10}, + {"write_inc", DT_NUM, R_NONE, UL &WriteInc, "10" }, /* ** .pp ** When writing a mailbox, a message will be printed every @@ -3578,32 +3673,32 @@ struct option_t MuttVars[] = { ** .pp ** Also see the ``$$read_inc'' variable. */ - {"write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, 1}, + {"write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, "yes" }, /* ** .pp - ** Controls whether Mutt-ng writes out the Bcc header when preparing + ** Controls whether Madmutt writes out the Bcc header when preparing ** messages to be sent. Exim users may wish to \fIunset\fP this. */ - {"xterm_icon", DT_STR, R_BOTH, UL &XtermIcon, UL "M%?n?AIL&ail?"}, + {"xterm_icon", DT_STR, R_BOTH, UL &XtermIcon, "M%?n?AIL&ail?"}, /* ** .pp ** Controls the format of the X11 icon title, as long as $$xterm_set_titles ** is \fIset\fP. This string is identical in formatting to the one used by ** ``$$status_format''. */ - {"xterm_set_titles", DT_BOOL, R_BOTH, OPTXTERMSETTITLES, 0}, + {"xterm_set_titles", DT_BOOL, R_BOTH, OPTXTERMSETTITLES, "no" }, /* ** .pp - ** Controls whether Mutt-ng sets the xterm title bar and icon name + ** Controls whether Madmutt sets the xterm title bar and icon name ** (as long as you're in an appropriate terminal). The default must ** be \fIunset\fP to force in the validity checking. */ - {"xterm_leave", DT_STR, R_BOTH, UL &XtermLeave, UL "" }, + {"xterm_leave", DT_STR, R_BOTH, UL &XtermLeave, "" }, /* ** .pp ** If $$xterm_set_titles is \fIset\fP, this string will be used to - ** set the title when leaving mutt-ng. For terminal-based programs, - ** there's no easy and portable way to read the current title so mutt-ng + ** set the title when leaving Madmutt. For terminal-based programs, + ** there's no easy and portable way to read the current title so Madmutt ** cannot read it upon startup and restore it when exiting. ** ** .pp @@ -3612,7 +3707,7 @@ struct option_t MuttVars[] = { ** .pp ** \fTset xterm_leave = "`test x$$$DISPLAY != x && xprop -id $$$WINDOWID | grep WM_NAME | cut -d '"' -f 2`"\fP */ - {"xterm_title", DT_STR, R_BOTH, UL &XtermTitle, UL "Mutt-ng with %?m?%m messages&no messages?%?n? [%n New]?"}, + {"xterm_title", DT_STR, R_BOTH, UL &XtermTitle, "Madmutt with %?m?%m messages&no messages?%?n? [%n New]?"}, /* ** .pp ** Controls the format of the title bar of the xterm provided that @@ -3620,164 +3715,69 @@ struct option_t MuttVars[] = { ** to the one used by ``$$status_format''. */ #ifdef USE_NNTP - {"x_comment_to", DT_SYN, R_NONE, UL "nntp_x_comment_to", 0}, - {"nntp_x_comment_to", DT_BOOL, R_NONE, OPTXCOMMENTTO, 0}, + {"nntp_x_comment_to", DT_BOOL, R_NONE, OPTXCOMMENTTO, "no" }, /* ** .pp ** Availability: NNTP ** ** .pp - ** If \fIset\fP, Mutt-ng will add a ``\fTX-Comment-To:\fP'' header field + ** If \fIset\fP, Madmutt will add a ``\fTX-Comment-To:\fP'' header field ** (that contains full name of the original article author) to articles that ** you followup to. */ #endif /*--*/ - { NULL } + { NULL, -1, R_NONE, -1, NULL } }; -const struct feature_t Features[] = { - {"ncurses", +static const char* Features[] = { #ifdef NCURSES_VERSION - 1 -#else - 0 + "ncurses", #endif - }, {"slang", #ifdef USE_SLANG_CURSES - 1 -#else - 0 + "slang", #endif - }, {"iconv", #ifdef _LIBICONV_VERSION - 1 -#else - 0 + "iconv", #endif - }, {"idn", #ifdef HAVE_LIBIDN - 1 -#else - 0 -#endif - }, {"dotlock", -#ifdef USE_DOTLOCK - 1 -#else - 0 -#endif - }, {"standalone", -#ifdef DL_STANDALONE - 1 -#else - 0 -#endif - }, {"pop", -#ifdef USE_POP - 1 -#else - 0 + "idn", #endif - }, {"nntp", #ifdef USE_NNTP - 1 -#else - 0 -#endif - }, {"imap", -#ifdef USE_IMAP - 1 -#else - 0 + "nntp", #endif - }, {"ssl", #ifdef USE_SSL - 1 -#else - 0 + "ssl", #endif - }, {"gnutls", #ifdef USE_GNUTLS - 1 -#else - 0 + "gnutls", #endif - }, {"sasl", #ifdef USE_SASL - 1 -#else - 0 + "sasl", #endif - }, {"sasl2", -#ifdef USE_SASL2 - 1 -#else - 0 -#endif - }, {"libesmtp", #ifdef USE_LIBESMTP - 1 -#else - 0 + "libesmtp", #endif - }, {"compressed", -#ifdef USE_COMPRESSED - 1 -#else - 0 -#endif - }, {"color", #ifdef HAVE_COLOR - 1 -#else - 0 -#endif - }, {"classic_pgp", -#ifdef CRYPT_BACKEND_CLASSIC_PGP - 1 -#else - 0 -#endif - }, {"classic_smime", -#ifdef CRYPT_BACKEND_CLASSIC_SMIME - 1 -#else - 0 + "color", #endif - }, {"gpgme", #ifdef CRYPT_BACKEND_GPGME - 1 -#else - 0 + "gpgme", #endif - }, {"header_cache", #ifdef USE_HCACHE - 1 -#else - 0 + "header_cache", #endif - }, {"qdbm", #ifdef HAVE_QDBM - 1 -#else - 0 + "qdbm", #endif - }, {"gdbm", #ifdef HAVE_GDBM - 1 -#else - 0 + "gdbm", #endif - }, {"db4", #ifdef HAVE_DB4 - 1 -#else - 0 + "db4", #endif - }, /* last */ - {NULL, 0} + NULL }; const struct mapping_t SortMethods[] = { @@ -3820,14 +3820,14 @@ const struct mapping_t SortBrowserMethods[] = { {"date", SORT_DATE}, {"size", SORT_SIZE}, {"unsorted", SORT_ORDER}, - {NULL} + {NULL, 0} }; const struct mapping_t SortAliasMethods[] = { {"alias", SORT_ALIAS}, {"address", SORT_ADDRESS}, {"unsorted", SORT_ORDER}, - {NULL} + {NULL, 0} }; const struct mapping_t SortKeyMethods[] = { @@ -3835,7 +3835,7 @@ const struct mapping_t SortKeyMethods[] = { {"date", SORT_DATE}, {"keyid", SORT_KEYID}, {"trust", SORT_TRUST}, - {NULL} + {NULL, 0} }; @@ -3844,7 +3844,8 @@ const struct mapping_t SortKeyMethods[] = { 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 *); static int parse_lists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *); @@ -3863,18 +3864,17 @@ static int parse_alternates (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalternates (BUFFER *, BUFFER *, unsigned long, BUFFER *); struct command_t { - char *name; + const char *name; int (*func) (BUFFER *, BUFFER *, unsigned long, BUFFER *); unsigned long data; - unsigned long data1; }; struct command_t Commands[] = { {"alternates", parse_alternates, 0}, + {"attachments", parse_attachments, 0 }, + {"unattachments",parse_unattachments,0 }, {"unalternates", parse_unalternates, 0}, -#ifdef USE_SOCKET {"account-hook", mutt_parse_hook, M_ACCOUNTHOOK}, -#endif {"alias", parse_alias, 0}, {"auto_view", parse_list, UL &AutoViewList}, {"alternative_order", parse_list, UL &AlternativeOrderList}, @@ -3888,11 +3888,9 @@ struct command_t Commands[] = { {"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 USE_COMPRESSED {"open-hook", mutt_parse_hook, M_OPENHOOK}, {"close-hook", mutt_parse_hook, M_CLOSEHOOK}, {"append-hook", mutt_parse_hook, M_APPENDHOOK}, -#endif {"hdr_order", parse_list, UL &HeaderOrderList}, {"ifdef", parse_ifdef, 1}, {"ifndef", parse_ifdef, 0}, @@ -3937,5 +3935,5 @@ struct command_t Commands[] = { {"unscore", mutt_parse_unscore, 0}, {"unset", parse_set, M_SET_UNSET}, {"unsubscribe", parse_unsubscribe, 0}, - {NULL} + {NULL, NULL, 0} };