X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=aa2c2bdd00277e64f25f677c1ef67ac8a063834a;hp=0719a13b7a26301030d8ddaeba9e8c206689f43c;hb=e7ca08ff86e3d01578d024a62385bafe7bceffd2;hpb=065004ef8c8451dcd9236467600d54d03d291c79 diff --git a/init.h b/init.h index 0719a13..aa2c2bd 100644 --- a/init.h +++ b/init.h @@ -35,7 +35,7 @@ #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 $muttng_ */ +#define DT_SYS 12 /* pre-defined via $madmutt_ */ #define DTYPE(x) ((x) & DT_MASK) @@ -63,11 +63,11 @@ #define R_RESORT_BOTH (R_RESORT|R_RESORT_SUB) struct option_t { - char *option; + const char *option; short type; short flags; unsigned long data; - char* init; + const char *init; }; #define UL (unsigned long) @@ -81,21 +81,12 @@ struct option_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 @@ -108,9 +99,6 @@ struct option_t { # ifndef USE_DOTLOCK # define USE_DOTLOCK # endif -# ifndef DL_STANDALONE -# define DL_STANDALONE -# endif # ifndef USE_HCACHE # define USE_HCACHE # endif @@ -158,13 +146,13 @@ 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, "~/.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, "%4n %2f %t %-10a %r"}, @@ -210,19 +198,19 @@ struct option_t MuttVars[] = { {"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, "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, "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, "us-ascii"}, @@ -243,24 +231,22 @@ 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, "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, "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 @@ -281,10 +267,12 @@ 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 @@ -292,7 +280,7 @@ struct option_t MuttVars[] = { {"attach_remind_regexp", DT_RX, R_NONE, UL &AttachRemindRegexp, "attach"}, /* ** .pp - ** If this variable is non-empty, muttng will scan a message's contents + ** 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 @@ -309,10 +297,10 @@ struct option_t MuttVars[] = { /* ** .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, "On %d, %n wrote:"}, /* @@ -324,7 +312,7 @@ struct option_t MuttVars[] = { {"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. @@ -342,12 +330,12 @@ struct option_t MuttVars[] = { {"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, "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. */ @@ -362,7 +350,7 @@ struct option_t MuttVars[] = { {"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. */ @@ -376,14 +364,13 @@ 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, "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 @@ -398,7 +385,7 @@ struct option_t MuttVars[] = { ** \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 @@ -407,16 +394,28 @@ struct option_t MuttVars[] = { {"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. */ + {"count_attachments", DT_BOOL, R_NONE, OPTCOUNTATTACH, "yes"}, + /* + ** .pp + ** 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, Mutt-ng will jump to the next unread message, if any, + ** 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, "-- 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'' @@ -427,7 +426,7 @@ 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 @@ -436,27 +435,27 @@ struct option_t MuttVars[] = { {"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, "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, "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" }, /* ** .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, "text/plain"}, /* @@ -476,17 +475,17 @@ struct option_t MuttVars[] = { /* ** .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, "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''. @@ -494,7 +493,7 @@ struct option_t MuttVars[] = { {"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''. @@ -514,7 +513,7 @@ struct option_t MuttVars[] = { ** English). */ #ifdef DEBUG - {"debug_level", DT_NUM, R_NONE, UL &DebugLevel, "0" }, + {"debug_level", DT_NUM, R_NONE, UL &DebugLevel, "1" }, /* ** .pp ** Availability: debug @@ -526,7 +525,7 @@ struct option_t MuttVars[] = { ** \fT-d\fP command line option. ** ** .pp - ** Currently, this number must be >= 0 and <= 5 and muttng + ** Currently, this number must be >= 0 and <= 5 and madmutt ** must be started with \fT-d\fP to enable debugging at all; ** enabling at runtime is not possible. */ @@ -569,14 +568,14 @@ struct option_t MuttVars[] = { {"delete_untag", DT_BOOL, R_NONE, OPTDELETEUNTAG, "yes" }, /* ** .pp - ** If this option is \fIset\fP, Mutt-ng will untag messages when marking them + ** 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, "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, ""}, @@ -586,15 +585,15 @@ struct option_t MuttVars[] = { ** is viewed it is passed as standard input to $$display_filter, and the ** filtered message is read from the standard output. */ -#if defined(DL_STANDALONE) && defined(USE_DOTLOCK) - {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$muttng_bindir/muttng_dotlock"}, +#if defined(USE_DOTLOCK) + {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$madmutt_bindir/muttng_dotlock"}, /* ** .pp - ** Availability: Standalone and Dotlock + ** Availability: 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, ""}, @@ -627,8 +626,8 @@ struct option_t MuttVars[] = { {"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. */ @@ -660,40 +659,44 @@ struct option_t MuttVars[] = { {"editor", DT_PATH, R_NONE, UL &Editor, "" }, /* ** .pp - ** This variable specifies which editor is used by Mutt-ng. + ** 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, "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. ** ** .pp - ** \fBNote:\fP as mutt-ng currently violates RfC3676 defining + ** \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, "^[^,]*"}, /* ** .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, "%4C %M%N %5s %-45.45f %d"}, /* ** .pp @@ -910,7 +911,7 @@ struct option_t MuttVars[] = { {"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. */ @@ -922,14 +923,14 @@ 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, "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. @@ -937,33 +938,33 @@ struct option_t MuttVars[] = { {"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, "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, "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, "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, "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. */ @@ -984,7 +985,7 @@ struct option_t MuttVars[] = { /* ** .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. @@ -994,35 +995,33 @@ struct option_t MuttVars[] = { ** .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, "" }, /* ** .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_check_subscribed", DT_BOOL, R_NONE, OPTIMAPCHECKSUBSCRIBED, "no" }, /* @@ -1031,12 +1030,8 @@ struct option_t MuttVars[] = { ** 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 - ** Availability: IMAP - ** ** .pp ** This contains the list of characters which you would like to treat ** as folder separators for displaying IMAP paths. In particular it @@ -1045,10 +1040,7 @@ struct option_t MuttVars[] = { {"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, "" }, /* ** .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 @@ -1058,9 +1050,6 @@ struct option_t MuttVars[] = { */ {"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 @@ -1069,12 +1058,9 @@ struct option_t MuttVars[] = { {"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 @@ -1086,9 +1072,6 @@ struct option_t MuttVars[] = { */ {"imap_login", DT_STR, R_NONE, UL &ImapLogin, "" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** Your login name on the IMAP server. ** .pp @@ -1096,9 +1079,6 @@ struct option_t MuttVars[] = { */ {"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 @@ -1107,17 +1087,14 @@ struct option_t MuttVars[] = { {"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, "" }, /* ** .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 @@ -1127,22 +1104,16 @@ struct option_t MuttVars[] = { {"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, "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. @@ -1150,19 +1121,13 @@ struct option_t MuttVars[] = { {"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, "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 @@ -1170,22 +1135,18 @@ struct option_t MuttVars[] = { */ {"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, "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. */ @@ -1198,7 +1159,7 @@ struct option_t MuttVars[] = { {"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, "> "}, @@ -1216,7 +1177,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 @@ -1245,7 +1206,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) @@ -1254,6 +1215,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 @@ -1277,7 +1239,6 @@ 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, ""}, /* ** .pp @@ -1285,7 +1246,7 @@ struct option_t MuttVars[] = { ** ** .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 @@ -1313,12 +1274,12 @@ struct option_t MuttVars[] = { ** 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, "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_display_recips", DT_NUM, R_PAGER, UL &MaxDispRecips, "0" }, /* @@ -1338,7 +1299,7 @@ struct option_t MuttVars[] = { {"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. @@ -1347,12 +1308,12 @@ struct option_t MuttVars[] = { /* ** .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, "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 @@ -1380,7 +1341,7 @@ struct option_t MuttVars[] = { ** 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. */ @@ -1425,10 +1386,10 @@ struct option_t MuttVars[] = { {"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. */ @@ -1452,45 +1413,45 @@ struct option_t MuttVars[] = { ** This specifies the folder into which read mail in your ``$$spoolfile'' ** folder will be appended. */ - {"muttng_version", DT_SYS, R_NONE, 0, VERSION }, + {"madmutt_version", DT_SYS, R_NONE, 0, VERSION }, /* ** .pp - ** \fIThis is a read-only system property and specifies muttng's + ** \fIThis is a read-only system property and specifies madmutt's ** version string.\fP */ - {"muttng_revision", DT_SYS, R_NONE, 0, MUTT_REVISION }, + {"madmutt_revision", DT_SYS, R_NONE, 0, MUTT_REVISION }, /* ** .pp - ** \fIThis is a read-only system property and specifies muttng's + ** \fIThis is a read-only system property and specifies madmutt's ** subversion revision string.\fP */ - {"muttng_sysconfdir", DT_SYS, R_NONE, 0, SYSCONFDIR }, + {"madmutt_sysconfdir", DT_SYS, R_NONE, 0, SYSCONFDIR }, /* ** .pp ** \fIThis is a read-only system property and specifies the - ** directory containing the muttng system-wide configuration.\fP + ** directory containing the madmutt system-wide configuration.\fP */ - {"muttng_bindir", DT_SYS, R_NONE, 0, BINDIR }, + {"madmutt_bindir", DT_SYS, R_NONE, 0, BINDIR }, /* ** .pp ** \fIThis is a read-only system property and specifies the - ** directory containing the muttng binary. + ** directory containing the madmutt binary.\fP */ - {"muttng_docdir", DT_SYS, R_NONE, 0, PKGDOCDIR }, + {"madmutt_docdir", DT_SYS, R_NONE, 0, PKGDOCDIR }, /* ** .pp ** \fIThis is a read-only system property and specifies the - ** directory containing the muttng documentation.\fP + ** directory containing the madmutt documentation.\fP */ -#if USE_HCACHE +#ifdef USE_HCACHE #if HAVE_QDBM - {"muttng_hcache_backend", DT_SYS, R_NONE, 0, "qdbm" }, + {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "qdbm" }, #elif HAVE_GDBM - {"muttng_hcache_backend", DT_SYS, R_NONE, 0, "gdbm" }, + {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "gdbm" }, #elif HAVE_DB4 - {"muttng_hcache_backend", DT_SYS, R_NONE, 0, "db4" }, + {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "db4" }, #else - {"muttng_hcache_backend", DT_SYS, R_NONE, 0, "unknown" }, + {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "unknown" }, #endif /* ** .pp @@ -1498,6 +1459,39 @@ struct option_t MuttVars[] = { ** 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 @@ -1505,7 +1499,7 @@ struct option_t MuttVars[] = { ** 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, "." }, /* @@ -1541,7 +1535,7 @@ struct option_t MuttVars[] = { ** .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 @@ -1554,6 +1548,7 @@ 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 @@ -1581,7 +1576,7 @@ struct option_t MuttVars[] = { {"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" }, @@ -1608,18 +1603,18 @@ struct option_t MuttVars[] = { {"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, "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. @@ -1669,7 +1664,6 @@ 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, "yes" }, /* ** .pp @@ -1716,7 +1710,7 @@ struct option_t MuttVars[] = { {"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. */ @@ -1730,8 +1724,8 @@ struct option_t MuttVars[] = { {"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: @@ -1764,21 +1758,19 @@ struct option_t MuttVars[] = { ** 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, "~/.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, "" }, /* ** .pp @@ -1800,7 +1792,6 @@ 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, "~/.newsrc"}, /* ** .pp @@ -1846,7 +1837,7 @@ struct option_t MuttVars[] = { ** ** .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, ""}, /* @@ -1860,7 +1851,6 @@ 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" }, /* ** .pp @@ -1868,7 +1858,7 @@ struct option_t MuttVars[] = { ** ** .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, "ask-yes" }, @@ -1877,10 +1867,19 @@ struct option_t MuttVars[] = { ** 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 + { "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 @@ -1890,7 +1889,7 @@ 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. */ @@ -1899,7 +1898,7 @@ struct option_t MuttVars[] = { ** .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, "-%Z- %C/%m: %-20.20n %s"}, @@ -1935,7 +1934,7 @@ struct option_t MuttVars[] = { {"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, @@ -1946,7 +1945,7 @@ struct option_t MuttVars[] = { {"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 @@ -1958,7 +1957,7 @@ struct option_t MuttVars[] = { {"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) @@ -1986,14 +1985,14 @@ struct option_t MuttVars[] = { ** 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, "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. @@ -2002,7 +2001,7 @@ struct option_t MuttVars[] = { {"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, "yes" }, @@ -2016,10 +2015,10 @@ struct option_t MuttVars[] = { {"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 @@ -2037,8 +2036,8 @@ struct option_t MuttVars[] = { {"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) */ @@ -2075,7 +2074,7 @@ struct option_t MuttVars[] = { {"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) @@ -2100,13 +2099,13 @@ struct option_t MuttVars[] = { {"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''. @@ -2118,16 +2117,16 @@ struct option_t MuttVars[] = { {"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''. @@ -2140,7 +2139,7 @@ struct option_t MuttVars[] = { {"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) @@ -2156,7 +2155,7 @@ struct option_t MuttVars[] = { {"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. @@ -2189,7 +2188,7 @@ struct option_t MuttVars[] = { {"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 @@ -2200,11 +2199,11 @@ struct option_t MuttVars[] = { {"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. */ @@ -2237,7 +2236,7 @@ struct option_t MuttVars[] = { {"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) */ @@ -2309,7 +2308,7 @@ 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, "" }, @@ -2320,7 +2319,7 @@ 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, "yes" }, @@ -2352,7 +2351,7 @@ struct option_t MuttVars[] = { {"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 @@ -2370,7 +2369,7 @@ struct option_t MuttVars[] = { {"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 @@ -2490,7 +2489,7 @@ struct option_t MuttVars[] = { ** ** .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_SYN, R_NONE, UL "smtp_pass", 0}, {"smtp_pass", DT_STR, R_NONE, UL &SmtpAuthPass, "" }, @@ -2507,20 +2506,8 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ - {"smtp_envelope", DT_STR, R_NONE, UL &SmtpEnvFrom, "" }, - /* - ** .pp - ** Availability: SMTP - ** - ** .pp - ** If this variable is non-empty, it'll be used as the envelope sender. If it's empty - ** (the default), the value of the regular \fTFrom:\fP header will be used. - ** - ** .pp - ** This may be necessary as some providers don't allow for arbitrary values - ** as the envelope sender but only a particular one which may not be the same as the - ** user's desired \fTFrom:\fP header. - */ + {"smtp_envelope", DT_SYN, R_NONE, UL "envelope_from_address", 0 }, + {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, "" }, /* ** .pp @@ -2555,7 +2542,7 @@ struct option_t MuttVars[] = { ** will try to start TLS and continue without TLS in case of an error. ** **.pp - ** Muttng still needs to have SSL support enabled in order to use it. + ** Madmutt still needs to have SSL support enabled in order to use it. */ #endif #if defined(USE_SSL) || defined(USE_GNUTLS) @@ -2573,7 +2560,7 @@ struct option_t MuttVars[] = { {"ssl_force_tls", DT_BOOL, R_NONE, OPTSSLFORCETLS, "no" }, /* ** .pp - ** If this variable is \fIset\fP, mutt-ng will require that all connections + ** 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 @@ -2585,8 +2572,8 @@ struct option_t MuttVars[] = { ** 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. */ {"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, "~/.mutt_certificates"}, @@ -2605,7 +2592,7 @@ 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, "yes" }, @@ -2614,7 +2601,7 @@ struct option_t MuttVars[] = { ** 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. */ @@ -2627,7 +2614,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, "yes" }, + {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "no" }, /* ** .pp ** Availability: SSL @@ -2683,8 +2670,8 @@ struct option_t MuttVars[] = { ** 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. */ @@ -2692,7 +2679,7 @@ struct option_t MuttVars[] = { /* ** .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. */ @@ -2702,20 +2689,16 @@ struct option_t MuttVars[] = { ** 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, "" }, /* ** .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 @@ -2723,39 +2706,27 @@ struct option_t MuttVars[] = { {"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" }, /* ** .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, "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, ""}, /* - ** .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.: @@ -2769,27 +2740,18 @@ struct option_t MuttVars[] = { {"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, "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, "" }, /* - ** .pp - ** Availability: POP - ** ** .pp ** Your login name on the POP server. ** .pp @@ -2798,32 +2760,27 @@ struct option_t MuttVars[] = { {"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, ""}, /* ** .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, "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 @@ -2840,19 +2797,18 @@ struct option_t MuttVars[] = { {"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, "" }, /* ** .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 @@ -2863,11 +2819,10 @@ 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, "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. */ @@ -2904,14 +2859,14 @@ struct option_t MuttVars[] = { /* ** .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, ""}, /* ** .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. @@ -2920,7 +2875,7 @@ struct option_t MuttVars[] = { /* ** .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. */ @@ -2951,9 +2906,9 @@ struct option_t MuttVars[] = { {"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. @@ -2982,7 +2937,7 @@ struct option_t MuttVars[] = { {"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 @@ -3009,14 +2964,14 @@ struct option_t MuttVars[] = { {"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, "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 @@ -3035,7 +2990,7 @@ struct option_t MuttVars[] = { {"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: @@ -3066,15 +3021,15 @@ struct option_t MuttVars[] = { /* ** .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, "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 @@ -3087,13 +3042,13 @@ 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, "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. */ @@ -3104,7 +3059,7 @@ struct option_t MuttVars[] = { ** 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, "no" }, @@ -3132,8 +3087,8 @@ struct option_t MuttVars[] = { /* ** .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" }, @@ -3146,14 +3101,14 @@ struct option_t MuttVars[] = { /* ** .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, "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 @@ -3164,8 +3119,8 @@ struct option_t MuttVars[] = { {"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" }, @@ -3174,7 +3129,7 @@ struct option_t MuttVars[] = { ** 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 @@ -3192,7 +3147,6 @@ struct option_t MuttVars[] = { ** 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, "no" }, /* ** .pp @@ -3204,7 +3158,6 @@ 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, "yes" }, /* ** .pp @@ -3216,7 +3169,6 @@ 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, "no" }, /* ** .pp @@ -3236,7 +3188,7 @@ 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, "no" }, @@ -3268,11 +3220,11 @@ struct option_t MuttVars[] = { {"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 @@ -3341,7 +3293,7 @@ struct option_t MuttVars[] = { ** 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 @@ -3376,11 +3328,11 @@ struct option_t MuttVars[] = { ** .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, ","}, @@ -3395,8 +3347,8 @@ struct option_t MuttVars[] = { {"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. */ @@ -3414,7 +3366,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, "-%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 @@ -3443,7 +3395,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" @@ -3483,7 +3435,7 @@ 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. */ @@ -3502,7 +3454,7 @@ 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. @@ -3528,19 +3480,21 @@ 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, "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, "\\([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. **/ @@ -3554,14 +3508,14 @@ struct option_t MuttVars[] = { {"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, "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. @@ -3571,7 +3525,7 @@ struct option_t MuttVars[] = { {"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, "no" }, @@ -3591,15 +3545,15 @@ struct option_t MuttVars[] = { {"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, "" }, /* ** .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. @@ -3628,11 +3582,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, "" }, /* ** .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 @@ -3641,11 +3594,10 @@ 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" }, /* ** .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, "no" }, @@ -3656,21 +3608,21 @@ struct option_t MuttVars[] = { ** 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 either invoke ``$$sendmail'' with the \fT-B8BITMIME\fP + ** When \fIset\fP, Madmutt will either invoke ``$$sendmail'' with the \fT-B8BITMIME\fP ** flag when sending 8-bit messages to enable ESMTP negotiation or tell ** libESMTP to do so. */ {"use_domain", DT_BOOL, R_NONE, OPTUSEDOMAIN, "yes" }, /* ** .pp - ** When \fIset\fP, 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, "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. @@ -3682,7 +3634,7 @@ struct option_t MuttVars[] = { ** 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. @@ -3692,8 +3644,8 @@ struct option_t MuttVars[] = { {"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 */ @@ -3701,20 +3653,14 @@ struct option_t MuttVars[] = { {"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, "" }, - /* - ** .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, "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 @@ -3722,13 +3668,13 @@ 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, "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, "yes" }, @@ -3743,7 +3689,7 @@ struct option_t MuttVars[] = { /* ** .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" }, /* @@ -3757,7 +3703,7 @@ struct option_t MuttVars[] = { {"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, "M%?n?AIL&ail?"}, @@ -3770,7 +3716,7 @@ struct option_t MuttVars[] = { {"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. */ @@ -3778,8 +3724,8 @@ struct option_t MuttVars[] = { /* ** .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 @@ -3788,7 +3734,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, "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 @@ -3796,20 +3742,19 @@ 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, "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 } }; static const char* Features[] = { @@ -3828,18 +3773,9 @@ static const char* Features[] = { #ifdef USE_DOTLOCK "dotlock", #endif -#ifdef DL_STANDALONE - "standalone", -#endif -#ifdef USE_POP - "pop", -#endif #ifdef USE_NNTP "nntp", #endif -#ifdef USE_IMAP - "imap", -#endif #ifdef USE_SSL "ssl", #endif @@ -3849,24 +3785,12 @@ static const char* Features[] = { #ifdef USE_SASL "sasl", #endif -#ifdef USE_SASL2 - "sasl2", -#endif #ifdef USE_LIBESMTP "libesmtp", #endif -#ifdef USE_COMPRESSED - "compessed", -#endif #ifdef HAVE_COLOR "color", #endif -#ifdef CRYPT_BACKEND_CLASSIC_PGP - "classic_pgp", -#endif -#ifdef CRYPT_BACKEND_CLASSIC_SMIME - "class_smime", -#endif #ifdef CRYPT_BACKEND_GPGME "gpgme", #endif @@ -3926,14 +3850,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[] = { @@ -3941,7 +3865,7 @@ const struct mapping_t SortKeyMethods[] = { {"date", SORT_DATE}, {"keyid", SORT_KEYID}, {"trust", SORT_TRUST}, - {NULL} + {NULL, 0} }; @@ -3950,7 +3874,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 *); @@ -3969,18 +3894,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}, @@ -3994,11 +3918,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}, @@ -4043,5 +3965,5 @@ struct command_t Commands[] = { {"unscore", mutt_parse_unscore, 0}, {"unset", parse_set, M_SET_UNSET}, {"unsubscribe", parse_unsubscribe, 0}, - {NULL} + {NULL, NULL, 0} };