X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=7f6bcb997699e1219f98725d28dd6dc650fc218c;hp=86271da8e2a9fbf52762d3a84c8e53b133f99ce6;hb=16be8d10413bbcf822577afd4019d65aba7459e0;hpb=c9f72ab0cd65f517a2047feb942ad85025c1b7e8 diff --git a/init.h b/init.h index 86271da..7f6bcb9 100644 --- a/init.h +++ b/init.h @@ -11,12 +11,7 @@ * please see the file GPL in the top level source directory. */ -#ifdef _MAKEDOC -# include "config.h" -#else -# include "sort.h" -#endif - +#include "sort.h" #include "mutt.h" #ifndef _MAKEDOC @@ -29,8 +24,6 @@ #define DT_SORT 6 /* sorting methods */ #define DT_RX 7 /* regular expressions */ #define DT_MAGIC 8 /* mailbox type */ -#define DT_SYN 9 /* synonym for another variable */ -#define DT_ADDR 10 /* e-mail address */ #define DTYPE(x) ((x) & DT_MASK) @@ -46,23 +39,9 @@ #define M_SET_UNSET (1<<1) /* default is to unset all vars */ #define M_SET_RESET (1<<2) /* default is to reset all vars to default */ -/* forced redraw/resort types */ -#define R_NONE 0 -#define R_INDEX (1<<0) -#define R_PAGER (1<<1) -#define R_BOTH (R_INDEX|R_PAGER) - -/* TODO:MC: will go in the the thread module */ -#define R_RESORT (1<<2) /* resort the mailbox */ -#define R_RESORT_SUB (1<<3) /* resort subthreads */ -#define R_RESORT_INIT (1<<4) /* resort from scratch */ -#define R_TREE (1<<5) /* redraw the thread tree */ -#define R_RESORT_BOTH (R_RESORT|R_RESORT_SUB) - struct option_t { const char *option; short type; - short flags; unsigned long data; const char *init; }; @@ -71,39 +50,11 @@ struct option_t { #endif /* _MAKEDOC */ -#ifndef ISPELL -#define ISPELL "ispell" -#endif - /* build complete documentation */ -#ifdef _MAKEDOC -# ifndef USE_SSL -# define USE_SSL -# endif -# ifndef USE_LIBESMTP -# define USE_LIBESMTP -# endif -# ifndef USE_NNTP -# define USE_NNTP -# endif -# ifndef USE_GNUTLS -# define USE_GNUTLS -# endif -# ifndef USE_HCACHE -# define USE_HCACHE -# endif -# ifndef HAVE_LIBIDN -# define HAVE_LIBIDN -# endif -# ifndef HAVE_GETADDRINFO -# define HAVE_GETADDRINFO -# endif -#endif - struct option_t MuttVars[] = { /*++*/ - {"abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, "no" }, + {"abort_noattach", DT_QUAD, OPT_ATTACH, "no" }, /* ** .pp ** This variable specifies whether to abort sending if no attachment @@ -121,7 +72,7 @@ struct option_t MuttVars[] = { ** .pp ** See also the $$attach_remind_regexp variable. */ - {"abort_nosubject", DT_QUAD, R_NONE, OPT_SUBJECT, "ask-yes" }, + {"abort_nosubject", DT_QUAD, OPT_SUBJECT, "ask-yes" }, /* ** .pp ** If set to \fIyes\fP, when composing messages and no subject is given @@ -129,7 +80,7 @@ struct option_t MuttVars[] = { ** \fIno\fP, composing messages with no subject given at the subject ** prompt will never be aborted. */ - {"abort_unmodified", DT_QUAD, R_NONE, OPT_ABORT, "yes" }, + {"abort_unmodified", DT_QUAD, OPT_ABORT, "yes" }, /* ** .pp ** If set to \fIyes\fP, composition will automatically abort after @@ -137,71 +88,25 @@ 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. */ - {"allow_8bit", DT_BOOL, R_NONE, OPTALLOW8BIT, "yes" }, + {"allow_8bit", DT_BOOL, OPTALLOW8BIT, "yes" }, /* ** .pp ** Controls whether 8-bit data is converted to 7-bit using either ** \fTquoted-printable\fP or \fTbase64\fP encoding when sending mail. */ - {"allow_ansi", DT_BOOL, R_NONE, OPTALLOWANSI, "no" }, - /* - ** .pp - ** Controls whether ANSI color codes in messages (and color tags in - ** rich text messages) are to be interpreted. - ** Messages containing these codes are rare, but if this option is set, - ** their text will be colored accordingly. Note that this may override - ** your color choices, and even present a security problem, since a - ** message could include a line like ``\fT[-- PGP output follows ...\fP" and - ** give it the same color as your attachment color. - */ - {"arrow_cursor", DT_BOOL, R_BOTH, OPTARROWCURSOR, "no" }, - /* - ** .pp - ** When \fIset\fP, an arrow (``\fT->\fP'') will be used to indicate the current entry - ** in menus instead of highlighting the whole line. On slow network or modem - ** links this will make response faster because there is less that has to - ** be redrawn on the screen when moving to the next or previous entries - ** in the menu. - */ - {"ascii_chars", DT_BOOL, R_BOTH, OPTASCIICHARS, "no" }, - /* - ** .pp - ** 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" }, + {"askbcc", DT_BOOL, OPTASKBCC, "no" }, /* ** .pp ** 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" }, + {"askcc", DT_BOOL, OPTASKCC, "no" }, /* ** .pp ** If \fIset\fP, Madmutt will prompt you for carbon-copy (Cc) recipients before ** editing the body of an outgoing message. */ -#ifdef USE_NNTP - {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, "no" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, Madmutt will prompt you for the \fTFollowup-To:\fP header - ** field before editing the body of an outgoing news article. - */ - {"nntp_ask_x_comment_to", DT_BOOL, R_NONE, OPTASKXCOMMENTTO, "no" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, Madmutt will prompt you for the \fTX-Comment-To:\fP header - ** field before editing the body of an outgoing news article. - */ -#endif - {"attach_format", DT_STR, R_NONE, UL &AttachFormat, "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "}, + {"attach_format", DT_STR, UL &AttachFormat, "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "}, /* ** .pp ** This variable describes the format of the ``attachment'' menu. The @@ -228,7 +133,7 @@ struct option_t MuttVars[] = { ** .dt %|X .dd pad to the end of the line with character "X" ** .de */ - {"attach_remind_regexp", DT_RX, R_NONE, UL &AttachRemindRegexp, "attach"}, + {"attach_remind_regexp", DT_RX, UL &AttachRemindRegexp, "attach"}, /* ** .pp ** If this variable is non-empty, madmutt will scan a message's contents @@ -238,13 +143,13 @@ struct option_t MuttVars[] = { ** This variable and $$abort_noattach are intended to remind the user ** to attach files if the message's text references them. */ - {"attach_sep", DT_STR, R_NONE, UL &AttachSep, "\n"}, + {"attach_sep", DT_STR, UL &AttachSep, "\n"}, /* ** .pp ** The separator to add between attachments when operating (saving, ** printing, piping, etc) on a list of tagged attachments. */ - {"attach_split", DT_BOOL, R_NONE, OPTATTACHSPLIT, "yes" }, + {"attach_split", DT_BOOL, OPTATTACHSPLIT, "yes" }, /* ** .pp ** If this variable is \fIunset\fP, when operating (saving, printing, piping, @@ -253,14 +158,14 @@ struct option_t MuttVars[] = { ** ``$$attach_sep'' separator is added after each attachment. When \fIset\fP, ** Madmutt will operate on the attachments one by one. */ - {"attribution", DT_STR, R_NONE, UL &Attribution, "On %d, %n wrote:"}, + {"attribution", DT_STR, UL &Attribution, "On %d, %n wrote:"}, /* ** .pp ** This is the string that will precede a message which has been included ** in a reply. For a full listing of defined \fTprintf(3)\fP-like sequences see ** the section on ``$$index_format''. */ - {"autoedit", DT_BOOL, R_NONE, OPTAUTOEDIT, "no" }, + {"autoedit", DT_BOOL, OPTAUTOEDIT, "no" }, /* ** .pp ** When \fIset\fP along with ``$$edit_headers'', Madmutt will skip the initial @@ -270,7 +175,7 @@ struct option_t MuttVars[] = { ** .pp ** Also see ``$$fast_reply''. */ - {"auto_tag", DT_BOOL, R_NONE, OPTAUTOTAG, "no" }, + {"auto_tag", DT_BOOL, OPTAUTOTAG, "no" }, /* ** .pp ** When \fIset\fP, functions in the \fIindex\fP menu which affect a message @@ -278,7 +183,7 @@ struct option_t MuttVars[] = { ** unset, you must first use the ``tag-prefix'' function (default: "\fT;\fP") to ** make the next function apply to all tagged messages. */ - {"bounce", DT_QUAD, R_NONE, OPT_BOUNCE, "ask-yes" }, + {"bounce", DT_QUAD, OPT_BOUNCE, "ask-yes" }, /* ** .pp ** Controls whether you will be asked to confirm bouncing messages. @@ -286,34 +191,14 @@ struct option_t MuttVars[] = { ** message. Setting this variable to \fIno\fP is not generally useful, ** and thus not recommended, because you are unable to bounce messages. */ - {"bounce_delivered", DT_BOOL, R_NONE, OPTBOUNCEDELIVERED, "yes" }, + {"bounce_delivered", DT_BOOL, OPTBOUNCEDELIVERED, "yes" }, /* ** .pp ** When this variable is \fIset\fP, Madmutt will include ** \fTDelivered-To:\fP header fields when bouncing messages. ** Postfix users may wish to \fIunset\fP this variable. */ - { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, "no" }, - /* - ** .pp - ** When this variable is set, mutt will place the cursor at the beginning - ** of the current line in menus, even when the arrow_cursor variable - ** is unset, making it easier for blind persons using Braille displays to - ** follow these menus. The option is disabled by default because many - ** visual terminals don't permit making the cursor invisible. - */ -#ifdef USE_NNTP - {"nntp_catchup", DT_QUAD, R_NONE, OPT_CATCHUP, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If this variable is \fIset\fP, Madmutt will mark all articles in a newsgroup - ** as read when you leaving it. - */ -#endif - {"check_new", DT_BOOL, R_NONE, OPTCHECKNEW, "yes" }, + {"check_new", DT_BOOL, OPTCHECKNEW, "yes" }, /* ** .pp ** \fBNote:\fP this option only affects \fImaildir\fP and \fIMH\fP style @@ -325,19 +210,19 @@ struct option_t MuttVars[] = { ** checking each file to see if it has already been looked at. If it's ** \fIunset\fP, no check for new mail is performed while the mailbox is open. */ - {"collapse_unread", DT_BOOL, R_NONE, OPTCOLLAPSEUNREAD, "yes" }, + {"collapse_unread", DT_BOOL, OPTCOLLAPSEUNREAD, "yes" }, /* ** .pp ** When \fIunset\fP, Madmutt will not collapse a thread if it contains any ** unread messages. */ - {"uncollapse_jump", DT_BOOL, R_NONE, OPTUNCOLLAPSEJUMP, "no" }, + {"uncollapse_jump", DT_BOOL, OPTUNCOLLAPSEJUMP, "no" }, /* ** .pp ** When \fIset\fP, Madmutt will jump to the next unread message, if any, ** when the current thread is \fIun\fPcollapsed. */ - {"compose_format", DT_STR, R_BOTH, UL &ComposeFormat, "-- Madmutt: Compose [Approx. msg size: %l Atts: %a]%>-"}, + {"compose_format", DT_STR, UL &ComposeFormat, "-- Madmutt: Compose [Approx. msg size: %l Atts: %a]%>-"}, /* ** .pp ** Controls the format of the status line displayed in the ``compose'' @@ -354,71 +239,45 @@ struct option_t MuttVars[] = { ** See the text describing the ``$$status_format'' option for more ** information on how to set ``$$compose_format''. */ - {"config_charset", DT_STR, R_NONE, UL &ConfigCharset, "" }, + {"config_charset", DT_STR, UL &ConfigCharset, "" }, /* ** .pp ** When defined, Madmutt will recode commands in rc files from this ** encoding. */ - {"confirmappend", DT_BOOL, R_NONE, OPTCONFIRMAPPEND, "yes" }, + {"confirmappend", DT_BOOL, OPTCONFIRMAPPEND, "yes" }, /* ** .pp ** When \fIset\fP, Madmutt will prompt for confirmation when appending messages to ** an existing mailbox. */ - {"confirmcreate", DT_BOOL, R_NONE, OPTCONFIRMCREATE, "yes" }, + {"confirmcreate", DT_BOOL, OPTCONFIRMCREATE, "yes" }, /* ** .pp ** When \fIset\fP, Madmutt will prompt for confirmation when saving messages to a ** mailbox which does not yet exist before creating it. */ - {"connect_timeout", DT_NUM, R_NONE, UL &ConnectTimeout, "30" }, + {"connect_timeout", DT_NUM, UL &ConnectTimeout, "30" }, /* ** .pp ** 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 Madmutt to wait indefinitely for the connection to succeed. */ - {"content_type", DT_STR, R_NONE, UL &ContentType, "text/plain"}, + {"content_type", DT_STR, UL &ContentType, "text/plain"}, /* ** .pp ** Sets the default \fTContent-Type:\fP header field for the body ** of newly composed messages. */ - {"copy", DT_QUAD, R_NONE, OPT_COPY, "yes" }, + {"copy", DT_QUAD, OPT_COPY, "yes" }, /* ** .pp ** This variable controls whether or not copies of your outgoing messages ** will be saved for later references. Also see ``$$record'', - ** ``$$save_name'', ``$$force_name'' and ``$fcc-hook''. + ** and ``$fcc-hook''. */ - {"crypt_use_gpgme", DT_BOOL, R_NONE, OPTCRYPTUSEGPGME, "no" }, - /* - ** .pp - ** This variable controls the use the GPGME enabled crypto backends. - ** If it is \fIset\fP and 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.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 Madmutt may automatically enable - ** PGP encryption/signing for messages. See also ``$$crypt_autoencrypt'', - ** ``$$crypt_replyencrypt'', - ** ``$$crypt_autosign'', ``$$crypt_replysign'' and ``$$smime_is_default''. - */ - {"crypt_autosmime", DT_BOOL, R_NONE, OPTCRYPTAUTOSMIME, "yes" }, - /* - ** .pp - ** This variable controls whether or not Madmutt may automatically enable - ** S/MIME encryption/signing for messages. See also ``$$crypt_autoencrypt'', - ** ``$$crypt_replyencrypt'', - ** ``$$crypt_autosign'', ``$$crypt_replysign'' and ``$$smime_is_default''. - */ - {"date_format", DT_STR, R_BOTH, UL &DateFmt, "!%a, %b %d, %Y at %I:%M:%S%p %Z"}, + {"date_format", DT_STR, UL &DateFmt, "!%a, %b %d, %Y at %I:%M:%S%p %Z"}, /* ** .pp ** This variable controls the format of the date printed by the ``\fT%d\fP'' @@ -432,7 +291,7 @@ struct option_t MuttVars[] = { ** rest of the string are expanded in the \fIC\fP locale (that is in US ** English). */ - {"default_hook", DT_STR, R_NONE, UL &DefaultHook, "~f %s !~P | (~P ~C %s)"}, + {"default_hook", DT_STR, UL &DefaultHook, "~f %s !~P | (~P ~C %s)"}, /* ** .pp ** This variable controls how send-hooks, message-hooks, save-hooks, @@ -446,7 +305,7 @@ struct option_t MuttVars[] = { ** ``alternates'') and is to or cc'ed to a user matching the given ** regular expression. */ - {"delete", DT_QUAD, R_NONE, OPT_DELETE, "ask-yes" }, + {"delete", DT_QUAD, OPT_DELETE, "ask-yes" }, /* ** .pp ** Controls whether or not messages are really deleted when closing or @@ -454,7 +313,7 @@ struct option_t MuttVars[] = { ** deleting will automatically be purged without prompting. If set to ** \fIno\fP, messages marked for deletion will be kept in the mailbox. */ - {"delete_space", DT_BOOL, R_NONE, OPTDELSP, "no" }, + {"delete_space", DT_BOOL, OPTDELSP, "no" }, /* ** .pp ** When sending messages with \fTformat=flowed\fP by \fIsetting\fP the @@ -467,27 +326,27 @@ struct option_t MuttVars[] = { ** \fBNote:\fP this variable only has an effect on \fIoutgoing\fP messages ** (if $$text_flowed is \fIset\fP) but not on incomming. */ - {"delete_untag", DT_BOOL, R_NONE, OPTDELETEUNTAG, "yes" }, + {"delete_untag", DT_BOOL, OPTDELETEUNTAG, "yes" }, /* ** .pp ** If this option is \fIset\fP, Madmutt will untag messages when marking them ** for deletion. This applies when you either explicitly delete a message, ** or when you save it to another folder. */ - {"digest_collapse", DT_BOOL, R_NONE, OPTDIGESTCOLLAPSE, "yes" }, + {"digest_collapse", DT_BOOL, OPTDIGESTCOLLAPSE, "yes" }, /* ** .pp ** 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, ""}, + {"display_filter", DT_PATH, UL &DisplayFilter, ""}, /* ** .pp ** When \fIset\fP, specifies a command used to filter messages. When a message ** is viewed it is passed as standard input to $$display_filter, and the ** filtered message is read from the standard output. */ - {"duplicate_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTDUPTHREADS, "yes" }, + {"duplicate_threads", DT_BOOL, OPTDUPTHREADS, "yes" }, /* ** .pp ** This variable controls whether Madmutt, when sorting by threads, threads @@ -495,7 +354,7 @@ struct option_t MuttVars[] = { ** If it is \fIset\fP, it will indicate that it thinks they are duplicates ** of each other with an equals sign in the thread diagram. */ - {"edit_headers", DT_BOOL, R_NONE, OPTEDITHDRS, "no" }, + {"edit_headers", DT_BOOL, OPTEDITHDRS, "no" }, /* ** .pp ** This option allows you to edit the header of your outgoing messages @@ -505,11 +364,7 @@ struct option_t MuttVars[] = { ** Which empty header fields to show is controlled by the ** $$editor_headers option. */ -#ifdef USE_NNTP - {"editor_headers", DT_STR, R_NONE, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To: Newsgroups: Followup-To: X-Comment-To:" }, -#else - {"editor_headers", DT_STR, R_NONE, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To:" }, -#endif + {"editor_headers", DT_STR, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To:" }, /* ** .pp ** If $$edit_headers is \fIset\fP, this space-separated list specifies @@ -520,7 +375,7 @@ struct option_t MuttVars[] = { ** Note: if $$edit_headers had to be turned on by force because ** $$strict_mailto is \fIunset\fP, this option has no effect. */ - {"encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, "no" }, + {"encode_from", DT_BOOL, OPTENCODEFROM, "no" }, /* ** .pp ** When \fIset\fP, Madmutt will \fTquoted-printable\fP encode messages when @@ -535,7 +390,7 @@ struct option_t MuttVars[] = { ** you must take care of space-stuffing '\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. - */ -#ifdef USE_NNTP - {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, "%4C %M%N %5s %-45.45f %d"}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable allows you to customize the newsgroup browser display to - ** your personal taste. This string is similar to ``$index_format'', but - ** has its own set of \fTprintf(3)\fP-like sequences: - ** .pp - ** .ts - ** %C current newsgroup number - ** %d description of newsgroup (retrieved from server) - ** %f newsgroup name - ** %M ``-'' if newsgroup not allowed for direct post (moderated for example) - ** %N ``N'' if newsgroup is new, ``u'' if unsubscribed, blank otherwise - ** %n number of new articles in newsgroup - ** %s number of unread articles in newsgroup - ** %>X right justify the rest of the string and pad with character "X" - ** %|X pad to the end of the line with character "X" - ** .te - */ -#endif - {"hdrs", DT_BOOL, R_NONE, OPTHDRS, "yes" }, - /* - ** .pp - ** When \fIunset\fP, the header fields normally added by the ``$my_hdr'' - ** command are not created. This variable \fImust\fP be \fIunset\fP before - ** composing a new message or replying in order to take effect. If \fIset\fP, - ** the user defined header fields are added to every new message. - */ - {"header", DT_BOOL, R_NONE, OPTHEADER, "no" }, + {"header", DT_BOOL, OPTHEADER, "no" }, /* ** .pp ** When \fIset\fP, this variable causes Madmutt to include the header ** of the message you are replying to into the edit buffer. ** The ``$$weed'' setting applies. */ - {"help", DT_BOOL, R_BOTH, OPTHELP, "yes" }, - /* - ** .pp - ** When \fIset\fP, help lines describing the bindings for the major functions - ** provided by each menu are displayed on the first line of the screen. - ** .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 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" }, + {"hidden_host", DT_BOOL, OPTHIDDENHOST, "no" }, /* ** .pp ** When \fIset\fP, Madmutt will skip the host name part of ``$$hostname'' variable @@ -744,53 +519,53 @@ struct option_t MuttVars[] = { ** affect the generation of \fTMessage-ID:\fP header fields, and it will not lead to the ** cut-off of first-level domains. */ - {"hide_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDELIMITED, "no" }, + {"hide_limited", DT_BOOL, OPTHIDELIMITED, "no" }, /* ** .pp ** 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" }, + {"hide_missing", DT_BOOL, OPTHIDEMISSING, "yes" }, /* ** .pp ** 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" }, + {"hide_thread_subject", DT_BOOL, OPTHIDETHREADSUBJECT, "yes" }, /* ** .pp ** 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" }, + {"hide_top_limited", DT_BOOL, OPTHIDETOPLIMITED, "no" }, /* ** .pp ** 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 \fIset\fP, this option will have no effect. */ - {"hide_top_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPMISSING, "yes" }, + {"hide_top_missing", DT_BOOL, OPTHIDETOPMISSING, "yes" }, /* ** .pp ** When \fIset\fP, Madmutt will not show the presence of missing messages at the ** top of threads in the thread tree. Note that when $$hide_limited is ** \fIset\fP, this option will have no effect. */ - {"history", DT_NUM, R_NONE, UL &HistSize, "10" }, + {"history", DT_NUM, UL &HistSize, "10" }, /* ** .pp ** This variable controls the size (in number of strings remembered) of ** the string history buffer. The buffer is cleared each time the ** variable is changed. */ - {"honor_followup_to", DT_QUAD, R_NONE, OPT_MFUPTO, "yes" }, + {"honor_followup_to", DT_QUAD, OPT_MFUPTO, "yes" }, /* ** .pp ** This variable controls whether or not a \fTMail-Followup-To:\fP header field is ** honored when group-replying to a message. */ - {"ignore_list_reply_to", DT_BOOL, R_NONE, OPTIGNORELISTREPLYTO, "no" }, + {"ignore_list_reply_to", DT_BOOL, OPTIGNORELISTREPLYTO, "no" }, /* ** .pp ** Affects the behaviour of the \fIreply\fP function when replying to @@ -804,7 +579,7 @@ struct option_t MuttVars[] = { ** Remember: This option works only for mailing lists which are explicitly set in your madmuttrc ** configuration file. */ - {"imap_authenticators", DT_STR, R_NONE, UL &ImapAuthenticators, "" }, + {"imap_authenticators", DT_STR, UL &ImapAuthenticators, "" }, /* ** .pp ** This is a colon-delimited list of authentication methods Madmutt may @@ -823,21 +598,21 @@ struct option_t MuttVars[] = { ** the previous methods are unavailable. If a method is available but ** authentication fails, Madmutt will not connect to the IMAP server. */ - { "imap_check_subscribed", DT_BOOL, R_NONE, OPTIMAPCHECKSUBSCRIBED, "no" }, + { "imap_check_subscribed", DT_BOOL, OPTIMAPCHECKSUBSCRIBED, "no" }, /* ** .pp ** When \fIset\fP, mutt will fetch the set of subscribed folders from ** your server on connection, and add them to the set of mailboxes ** it polls for new mail. See also the ``$mailboxes'' command. */ - {"imap_delim_chars", DT_STR, R_NONE, UL &ImapDelimChars, "/."}, + {"imap_delim_chars", DT_STR, UL &ImapDelimChars, "/."}, /* ** .pp ** This contains the list of characters which you would like to treat ** as folder separators for displaying IMAP paths. In particular it ** helps in using the '\fT=\fP' shortcut for your $$folder variable. */ - {"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, "" }, + {"imap_headers", DT_STR, UL &ImapHeaders, "" }, /* ** .pp ** Madmutt requests these header fields in addition to the default headers @@ -848,14 +623,7 @@ struct option_t MuttVars[] = { ** .pp ** \fBNote:\fP This is a space separated list. */ - {"imap_home_namespace", DT_STR, R_NONE, UL &ImapHomeNamespace, "" }, - /* - ** .pp - ** You normally want to see your personal folders alongside - ** your \fTINBOX\fP in the IMAP browser. If you see something else, you may set - ** this variable to the IMAP path to your folders. - */ - {"imap_keepalive", DT_NUM, R_NONE, UL &ImapKeepalive, "900" }, + {"imap_keepalive", DT_NUM, UL &ImapKeepalive, "900" }, /* ** .pp ** This variable specifies the maximum amount of time in seconds that Madmutt @@ -870,28 +638,28 @@ struct option_t MuttVars[] = { ** Reduce this number if you find yourself ** getting disconnected from your IMAP server due to inactivity. */ - {"imap_login", DT_STR, R_NONE, UL &ImapLogin, "" }, + {"imap_login", DT_STR, UL &ImapLogin, "" }, /* ** .pp ** Your login name on the IMAP server. ** .pp ** This variable defaults to the value of ``$$imap_user.'' */ - {"imap_list_subscribed", DT_BOOL, R_NONE, OPTIMAPLSUB, "no" }, + {"imap_list_subscribed", DT_BOOL, OPTIMAPLSUB, "no" }, /* ** .pp ** This variable configures whether IMAP folder browsing will look for ** only subscribed folders or all folders. This can be toggled in the ** IMAP browser with the \fItoggle-subscribed\fP function. */ - {"imap_mail_check", DT_NUM, R_NONE, UL &ImapBuffyTimeout, "300" }, + {"imap_mail_check", DT_NUM, UL &ImapBuffyTimeout, "300" }, /* ** .pp ** 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, "" }, + {"imap_pass", DT_STR, UL &ImapPass, "" }, /* ** .pp ** Specifies the password for your IMAP account. If \fIunset\fP, Madmutt will @@ -901,7 +669,7 @@ struct option_t MuttVars[] = { ** fairly secure machine, because the superuser can read your configuration even ** if you are the only one who can read the file. */ - {"imap_passive", DT_BOOL, R_NONE, OPTIMAPPASSIVE, "yes" }, + {"imap_passive", DT_BOOL, OPTIMAPPASSIVE, "yes" }, /* ** .pp ** When \fIset\fP, Madmutt will not open new IMAP connections to check for new @@ -910,21 +678,13 @@ struct option_t MuttVars[] = { ** user/password pairs on Madmutt invocation, or if opening the connection ** is slow. */ - {"imap_peek", DT_BOOL, R_NONE, OPTIMAPPEEK, "yes" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will avoid implicitly marking your mail as read whenever - ** you fetch a message from the server. This is generally a good thing, - ** but can make closing an IMAP folder somewhat slower. This option - ** exists to appease speed freaks. - */ - {"imap_reconnect", DT_QUAD, R_NONE, OPT_IMAPRECONNECT, "ask-yes" }, + {"imap_reconnect", DT_QUAD, OPT_IMAPRECONNECT, "ask-yes" }, /* ** .pp ** 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" }, + {"imap_servernoise", DT_BOOL, OPTIMAPSERVERNOISE, "yes" }, /* ** .pp ** When \fIset\fP, Madmutt will display warning messages from the IMAP @@ -933,7 +693,7 @@ struct option_t MuttVars[] = { ** server which are out of the users' hands, you may wish to suppress ** them at some point. */ - {"imap_user", DT_STR, R_NONE, UL &ImapUser, "" }, + {"imap_user", DT_STR, UL &ImapUser, "" }, /* ** .pp ** The name of the user whose mail you intend to access on the IMAP @@ -941,7 +701,7 @@ struct option_t MuttVars[] = { ** .pp ** This variable defaults to your user name on the local machine. */ - {"implicit_autoview", DT_BOOL, R_NONE, OPTIMPLICITAUTOVIEW, "no" }, + {"implicit_autoview", DT_BOOL, OPTIMPLICITAUTOVIEW, "no" }, /* ** .pp ** If \fIset\fP, Madmutt will look for a mailcap entry with the @@ -950,26 +710,20 @@ struct option_t MuttVars[] = { ** use the viewer defined in that entry to convert the body part to text ** form. */ - {"include", DT_QUAD, R_NONE, OPT_INCLUDE, "ask-yes" }, + {"include", DT_QUAD, OPT_INCLUDE, "ask-yes" }, /* ** .pp ** Controls whether or not a copy of the message(s) you are replying to ** is included in your reply. */ - {"include_onlyfirst", DT_BOOL, R_NONE, OPTINCLUDEONLYFIRST, "no" }, - /* - ** .pp - ** Controls whether or not Madmutt includes only the first attachment - ** of the message you are replying. - */ - {"indent_string", DT_STR, R_NONE, UL &Prefix, "> "}, + {"indent_string", DT_STR, UL &Prefix, "> "}, /* ** .pp ** Specifies the string to prepend to each line of text quoted in a ** message to which you are replying. You are strongly encouraged not to ** change this value, as it tends to agitate the more fanatical netizens. */ - {"index_format", DT_STR, R_BOTH, UL &HdrFmt, "%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"}, + {"index_format", DT_STR, UL &HdrFmt, "%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"}, /* ** .pp ** This variable allows you to customize the message index display to @@ -1038,50 +792,27 @@ struct option_t MuttVars[] = { ** .pp ** See also: ``$$to_chars''. */ -#ifdef USE_NNTP - {"nntp_inews", DT_PATH, R_NONE, UL &Inews, ""}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, specifies the program and arguments used to deliver news posted - ** by Madmutt. Otherwise, Madmutt posts article using current connection. - ** The following \fTprintf(3)\fP-style sequence is understood: - ** .pp - ** .ts - ** %s newsserver name - ** .te - ** .pp - ** Example: \fTset inews="/usr/local/bin/inews -hS"\fP - */ -#endif - {"ispell", DT_PATH, R_NONE, UL &Ispell, ISPELL}, - /* - ** .pp - ** How to invoke ispell (GNU's spell-checking software). - */ - {"keep_flagged", DT_BOOL, R_NONE, OPTKEEPFLAGGED, "no" }, + {"keep_flagged", DT_BOOL, OPTKEEPFLAGGED, "no" }, /* ** .pp ** If \fIset\fP, read messages marked as flagged will not be moved ** from your spool mailbox to your ``$$mbox'' mailbox, or as a result of ** a ``$mbox-hook'' command. */ - {"locale", DT_STR, R_BOTH, UL &Locale, "C"}, + {"locale", DT_STR, UL &Locale, "C"}, /* ** .pp ** The locale used by \fTstrftime(3)\fP to format dates. Legal values are ** the strings your system accepts for the locale variable \fTLC_TIME\fP. */ - {"force_list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, "ask-no" }, + {"force_list_reply", DT_QUAD, OPT_LISTREPLY, "ask-no" }, /* ** .pp ** 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" }, + {"max_display_recips", DT_NUM, UL &MaxDispRecips, "0" }, /* ** .pp ** When set non-zero, this specifies the maximum number of recipient header @@ -1089,64 +820,14 @@ struct option_t MuttVars[] = { ** weeding is turned on. In case the number of lines exeeds its value, the ** last line will have 3 dots appended. */ - {"max_line_length", DT_NUM, R_PAGER, UL &MaxLineLength, "0" }, + {"max_line_length", DT_NUM, UL &MaxLineLength, "0" }, /* ** .pp ** When \fIset\fP, the maximum line length for displaying ``format = flowed'' messages is limited ** to this length. A value of 0 (which is also the default) means that the ** maximum line length is determined by the terminal width and $$wrapmargin. */ -#ifdef USE_HCACHE - {"header_cache", DT_PATH, R_NONE, UL &HeaderCache, "" }, - /* - ** .pp - ** Availability: Header Cache - ** - ** .pp - ** The $$header_cache variable points to the header cache database. - ** .pp - ** If $$header_cache points to a directory it will contain a header cache - ** database per folder. If $$header_cache points to a file that file will - ** be a single global header cache. By default it is \fIunset\fP so no - ** header caching will be used. - */ - {"maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, "yes" }, - /* - ** .pp - ** Availability: Header Cache - ** - ** .pp - ** Check for Maildir unaware programs other than Madmutt having modified maildir - ** files when the header cache is in use. This incurs one \fTstat(2)\fP per - ** message every time the folder is opened. - */ -#if defined(HAVE_GDBM) || defined(HAVE_DB4) - {"header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, "16384"}, - /* - ** .pp - ** Availability: Header Cache - ** - ** .pp - ** Change the maildir header cache database page size. - ** .pp - ** Too large - ** or too small of a page size for the common header can waste - ** space, memory effectiveness, or CPU time. The default should be more or - ** less the best you can get. For details google for mutt header - ** cache (first hit). - */ -#endif /* HAVE_GDBM || HAVE_DB 4 */ -#ifdef HAVE_QDBM - { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, "no" }, - /* - ** .pp - ** If enabled the header cache will be compressed. So only one fifth of the usual - ** diskspace is used, but the uncompression can result in a slower open of the - ** cached folder. - */ -#endif /* HAVE_QDBM */ -#endif /* USE_HCACHE */ - {"maildir_trash", DT_BOOL, R_NONE, OPTMAILDIRTRASH, "no" }, + {"maildir_trash", DT_BOOL, OPTMAILDIRTRASH, "no" }, /* ** .pp ** If \fIset\fP, messages marked as deleted will be saved with the maildir @@ -1158,7 +839,7 @@ struct option_t MuttVars[] = { ** .pp ** It is similiar to the trash option. */ - {"mark_old", DT_BOOL, R_BOTH, OPTMARKOLD, "yes" }, + {"mark_old", DT_BOOL, OPTMARKOLD, "yes" }, /* ** .pp ** Controls whether or not Madmutt marks \fInew\fP \fBunread\fP @@ -1168,56 +849,50 @@ struct option_t MuttVars[] = { ** will show up with an "O" next to them in the ``index'' menu, ** indicating that they are old. */ - {"markers", DT_BOOL, R_PAGER, OPTMARKERS, "yes" }, + {"markers", DT_BOOL, OPTMARKERS, "yes" }, /* ** .pp ** Controls the display of wrapped lines in the internal pager. If set, a ** ``\fT+\fP'' marker is displayed at the beginning of wrapped lines. Also see ** the ``$$smart_wrap'' variable. */ - {"mask", DT_RX, R_NONE, UL &Mask, "!^\\.[^.]"}, + {"mask", DT_RX, UL &Mask, "!^\\.[^.]"}, /* ** .pp ** A regular expression used in the file browser, optionally preceded by ** the \fInot\fP operator ``\fT!\fP''. Only files whose names match this mask ** will be shown. The match is always case-sensitive. */ - {"mbox", DT_PATH, R_BOTH, UL &Inbox, "~/mbox"}, + {"mbox", DT_PATH, UL &Inbox, "~/mbox"}, /* ** .pp ** This specifies the folder into which read mail in your ``$$spoolfile'' ** folder will be appended. */ - {"sidebar_boundary", DT_STR, R_BOTH, UL &SidebarBoundary, "." }, + {"sidebar_boundary", DT_STR, UL &SidebarBoundary, "." }, /* ** .pp ** When the sidebar is displayed and $$sidebar_shorten_hierarchy is \fIset\fP, this ** variable specifies the characters at which to split a folder name into ** ``hierarchy items.'' */ - {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, "|"}, - /* - ** .pp - ** This specifies the delimiter between the sidebar (if visible) and - ** other screens. - */ - {"sidebar_visible", DT_BOOL, R_BOTH, OPTMBOXPANE, "no" }, + {"sidebar_visible", DT_BOOL, OPTMBOXPANE, "no" }, /* ** .pp ** This specifies whether or not to show the sidebar (a list of folders specified ** with the ``mailboxes'' command). */ - {"sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, "0" }, + {"sidebar_width", DT_NUM, UL &SidebarWidth, "0" }, /* ** .pp ** The width of the sidebar. */ - {"sidebar_newmail_only", DT_BOOL, R_BOTH, OPTSIDEBARNEWMAILONLY, "no" }, + {"sidebar_newmail_only", DT_BOOL, OPTSIDEBARNEWMAILONLY, "no" }, /* ** .pp ** If \fIset\fP, only folders with new mail will be shown in the sidebar. */ - {"sidebar_number_format", DT_STR, R_BOTH, UL &SidebarNumberFormat, "%m%?n?(%n)?%?f?[%f]?"}, + {"sidebar_number_format", DT_STR, UL &SidebarNumberFormat, "%m%?n?(%n)?%?f?[%f]?"}, /* ** .pp ** This variable controls how message counts are printed when the sidebar @@ -1241,7 +916,7 @@ struct option_t MuttVars[] = { ** 1) These expandos only have a non-zero value for the current mailbox and ** will always be zero otherwise. */ - {"sidebar_shorten_hierarchy", DT_BOOL, R_NONE, OPTSHORTENHIERARCHY, "no" }, + {"sidebar_shorten_hierarchy", DT_BOOL, OPTSHORTENHIERARCHY, "no" }, /* ** .pp ** When \fIset\fP, the ``hierarchy'' of the sidebar entries will be shortened @@ -1254,51 +929,25 @@ struct option_t MuttVars[] = { ** At which characters this compression is done is controled via the ** $$sidebar_boundary variable. */ - {"mbox_type", DT_MAGIC, R_NONE, UL &DefaultMagic, "mbox" }, + {"mbox_type", DT_MAGIC, UL &DefaultMagic, "mbox" }, /* ** .pp ** The default mailbox type used when creating new folders. May be any of - ** \fTmbox\fP, \fTMMDF\fP, \fTMH\fP and \fTMaildir\fP. + ** \fTmbox\fP, \fTMH\fP and \fTMaildir\fP. */ - {"metoo", DT_BOOL, R_NONE, OPTMETOO, "no" }, + {"metoo", DT_BOOL, OPTMETOO, "no" }, /* ** .pp ** If \fIunset\fP, Madmutt will remove your address (see the ``alternates'' ** command) from the list of recipients when replying to a message. */ - {"menu_context", DT_NUM, R_NONE, UL &MenuContext, "0" }, + {"menu_context", DT_NUM, UL &MenuContext, "0" }, /* ** .pp ** This variable controls the number of lines of context that are given ** when scrolling through menus. (Similar to ``$$pager_context''.) */ - {"menu_move_off", DT_BOOL, R_NONE, OPTMENUMOVEOFF, "yes" }, - /* - ** .pp - ** When \fIunset\fP, the bottom entry of menus will never scroll up past - ** the bottom of the screen, unless there are less entries than lines. - ** When \fIset\fP, the bottom entry may move off the bottom. - */ - {"menu_scroll", DT_BOOL, R_NONE, OPTMENUSCROLL, "no" }, - /* - ** .pp - ** When \fIset\fP, menus will be scrolled up or down one line when you - ** attempt to move across a screen boundary. If \fIunset\fP, the screen - ** is cleared and the next or previous page of the menu is displayed - ** (useful for slow links to avoid many redraws). - */ - {"meta_key", DT_BOOL, R_NONE, OPTMETAKEY, "no" }, - /* - ** .pp - ** 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 \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 ``\fT0xf8\fP'' is ``\fT0x78\fP'', which is the ASCII character - ** ``\fTx\fP''. - */ - {"mh_purge", DT_BOOL, R_NONE, OPTMHPURGE, "no" }, + {"mh_purge", DT_BOOL, OPTMHPURGE, "no" }, /* ** .pp ** When \fIunset\fP, Madmutt will mimic mh's behaviour and rename deleted messages @@ -1306,22 +955,22 @@ struct option_t MuttVars[] = { ** them. If the variable is set, the message files will simply be ** deleted. */ - {"mh_seq_flagged", DT_STR, R_NONE, UL &MhFlagged, "flagged"}, + {"mh_seq_flagged", DT_STR, UL &MhFlagged, "flagged"}, /* ** .pp ** The name of the MH sequence used for flagged messages. */ - {"mh_seq_replied", DT_STR, R_NONE, UL &MhReplied, "replied"}, + {"mh_seq_replied", DT_STR, UL &MhReplied, "replied"}, /* ** .pp ** The name of the MH sequence used to tag replied messages. */ - {"mh_seq_unseen", DT_STR, R_NONE, UL &MhUnseen, "unseen"}, + {"mh_seq_unseen", DT_STR, UL &MhUnseen, "unseen"}, /* ** .pp ** The name of the MH sequence used for unseen messages. */ - {"mime_forward", DT_QUAD, R_NONE, OPT_MIMEFWD, "no" }, + {"mime_forward", DT_QUAD, OPT_MIMEFWD, "no" }, /* ** .pp ** When \fIset\fP, the message you are forwarding will be attached as a @@ -1335,70 +984,35 @@ struct option_t MuttVars[] = { ** .pp ** Also see ``$$forward_decode'' and ``$$mime_forward_decode''. */ - {"mime_forward_decode", DT_BOOL, R_NONE, OPTMIMEFORWDECODE, "no" }, + {"mime_forward_decode", DT_BOOL, OPTMIMEFORWDECODE, "no" }, /* ** .pp ** Controls the decoding of complex MIME messages into \fTtext/plain\fP when ** forwarding a message while ``$$mime_forward'' is \fIset\fP. Otherwise ** ``$$forward_decode'' is used instead. */ - {"mime_forward_rest", DT_QUAD, R_NONE, OPT_MIMEFWDREST, "yes" }, + {"mime_forward_rest", DT_QUAD, OPT_MIMEFWDREST, "yes" }, /* ** .pp ** When forwarding multiple attachments of a MIME message from the recvattach ** menu, attachments which cannot be decoded in a reasonable manner will ** be attached to the newly composed message if this option is set. */ -#ifdef USE_NNTP - {"nntp_mime_subject", DT_BOOL, R_NONE, OPTMIMESUBJECT, "yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIunset\fP, an 8-bit ``\fTSubject:\fP'' header field in a news article - ** will not be encoded according to RFC2047. - ** .pp - ** \fBNote:\fP Only change this setting if you know what you are doing. - */ -#endif - {"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, "%4n %c %-16s %a"}, - /* - ** .pp - ** This variable describes the format of a remailer line on the mixmaster - ** chain selection screen. The following \fTprintf(3)\fP-like sequences are - ** supported: - ** .pp - ** .dl - ** .dt %n .dd The running number on the menu. - ** .dt %c .dd Remailer capabilities. - ** .dt %s .dd The remailer's short name. - ** .dt %a .dd The remailer's e-mail address. - ** .de - */ - {"mixmaster", DT_PATH, R_NONE, UL &Mixmaster, MIXMASTER}, - /* - ** .pp - ** This variable contains the path to the Mixmaster binary on your - ** system. It is used with various sets of parameters to gather the - ** list of known remailers, and to finally send a message through the - ** mixmaster chain. - */ - {"move", DT_QUAD, R_NONE, OPT_MOVE, "ask-no" }, + {"move", DT_QUAD, OPT_MOVE, "ask-no" }, /* ** .pp ** Controls whether or not Madmutt will move read messages ** from your spool mailbox to your ``$$mbox'' mailbox, or as a result of ** a ``$mbox-hook'' command. */ - {"message_format", DT_STR, R_NONE, UL &MsgFmt, "%s"}, + {"message_format", DT_STR, UL &MsgFmt, "%s"}, /* ** .pp ** This is the string displayed in the ``attachment'' menu for ** attachments of type \fTmessage/rfc822\fP. For a full listing of defined ** \fTprintf(3)\fP-like sequences see the section on ``$$index_format''. */ - {"msgid_format", DT_STR, R_NONE, UL &MsgIdFormat, "%Y%m%d%h%M%s.G%P%p"}, + {"msgid_format", DT_STR, 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 @@ -1428,127 +1042,13 @@ struct option_t MuttVars[] = { ** \fBNote:\fP Please only change this setting if you know what you are doing. ** Also make sure to consult RFC2822 to produce technically \fIvalid\fP strings. */ - {"narrow_tree", DT_BOOL, R_TREE|R_INDEX, OPTNARROWTREE, "no" }, + {"narrow_tree", DT_BOOL, OPTNARROWTREE, "no" }, /* ** .pp ** This variable, when \fIset\fP, makes the thread tree narrower, allowing ** deeper threads to fit on the screen. */ -#ifdef USE_NNTP - {"nntp_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, "~/.madmutt"}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** 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. - */ - {"nntp_host", DT_STR, R_NONE, UL &NewsServer, "" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable specifies the name (or address) of the NNTP server to be used. - ** .pp - ** It - ** defaults to the value specified via the environment variable - ** \fT$$$NNTPSERVER\fP or contained in the file \fT/etc/nntpserver\fP. - ** .pp - ** You can also - ** specify a username and an alternative port for each newsserver, e.g. - ** .pp - ** \fT[nntp[s]://][username[:password]@]newsserver[:port]\fP - ** .pp - ** \fBNote:\fP Using a password as shown and stored in a configuration file - ** presents a security risk since the superuser of your machine may read it - ** regardless of the file's permissions. - */ - {"nntp_newsrc", DT_PATH, R_NONE, UL &NewsRc, "~/.newsrc"}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This file contains information about subscribed newsgroup and - ** articles read so far. - ** .pp - ** To ease the use of multiple news servers, the following \fTprintf(3)\fP-style - ** sequence is understood: - ** .pp - ** .ts - ** %s newsserver name - ** .te - */ - {"nntp_context", DT_NUM, R_NONE, UL &NntpContext, "1000" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable controls how many news articles to cache per newsgroup - ** (if caching is enabled, see $$nntp_cache_dir) and how many news articles - ** to show in the ``index'' menu. - ** .pp - ** If there're more articles than defined with $$nntp_context, all older ones - ** will be removed/not shown in the index. - */ - {"nntp_load_description", DT_BOOL, R_NONE, OPTLOADDESC, "yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable controls whether or not descriptions for newsgroups - ** are to be loaded when subscribing to a newsgroup. - */ - {"nntp_user", DT_STR, R_NONE, UL &NntpUser, ""}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** Your login name on the NNTP server. If \fIunset\fP and the server requires - ** authentification, Madmutt will prompt you for your account name. - */ - {"nntp_pass", DT_STR, R_NONE, UL &NntpPass, ""}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** Your password for NNTP account. - ** .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. - */ - {"nntp_mail_check", DT_NUM, R_NONE, UL &NewsPollTimeout, "60" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** The time in seconds until any operations on a newsgroup except posting a new - ** article will cause a recheck for new news. If set to 0, Madmutt will - ** recheck on each operation in index (stepping, read article, etc.). - */ - {"nntp_reconnect", DT_QUAD, R_NONE, OPT_NNTPRECONNECT, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** 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" }, + { "net_inc", DT_NUM, UL &NetInc, "10" }, /* ** .pp ** Operations that expect to transfer a large amount of data over the @@ -1557,20 +1057,7 @@ struct option_t MuttVars[] = { ** .pp ** See also ``$$read_inc'' and ``$$write_inc''. */ - {"pager", DT_PATH, R_NONE, UL &Pager, "builtin"}, - /* - ** .pp - ** This variable specifies which pager you would like to use to view - ** messages. ``builtin'' means to use the builtin pager, otherwise this - ** variable should specify the pathname of the external pager you would - ** like to use. - ** .pp - ** Using an external pager may have some disadvantages: Additional - ** keystrokes are necessary because you can't call Madmutt functions - ** directly from the pager, and screen resizes cause lines longer than - ** the screen width to be badly formatted in the help menu. - */ - {"pager_context", DT_NUM, R_NONE, UL &PagerContext, "0" }, + {"pager_context", DT_NUM, UL &PagerContext, "0" }, /* ** .pp ** This variable controls the number of lines of context that are given @@ -1578,7 +1065,7 @@ struct option_t MuttVars[] = { ** 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"}, + {"pager_format", DT_STR, UL &PagerFmt, "-%Z- %C/%m: %-20.20n %s"}, /* ** .pp ** This variable controls the format of the one-line message ``status'' @@ -1586,7 +1073,7 @@ struct option_t MuttVars[] = { ** pager. The valid sequences are listed in the ``$$index_format'' ** section. */ - {"pager_index_lines", DT_NUM, R_PAGER, UL &PagerIndexLines, "0" }, + {"pager_index_lines", DT_NUM, UL &PagerIndexLines, "0" }, /* ** .pp ** Determines the number of lines of a mini-index which is shown when in @@ -1601,741 +1088,84 @@ struct option_t MuttVars[] = { ** is less than \fIpager_index_lines\fP, then the index will only use as ** many lines as it needs. */ - {"pager_stop", DT_BOOL, R_NONE, OPTPAGERSTOP, "no" }, + {"pager_stop", DT_BOOL, OPTPAGERSTOP, "no" }, /* ** .pp ** When \fIset\fP, the internal-pager will \fBnot\fP move to the next message ** when you are at the end of a message and invoke the \fInext-page\fP ** function. */ - {"crypt_autosign", DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, "no" }, + {"pgp_retainable_sigs", DT_BOOL, OPTPGPRETAINABLESIG, "no" }, /* ** .pp - ** 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, - ** then OpenSSL is used instead to create S/MIME messages and settings can - ** be overridden by use of the \fIsmime-menu\fP. - ** (Crypto only) - */ - {"crypt_autoencrypt", DT_BOOL, R_NONE, OPTCRYPTAUTOENCRYPT, "no" }, - /* - ** .pp - ** 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 - ** signing is requested as well. If ``$$smime_is_default'' is \fIset\fP, - ** then OpenSSL is used instead to create S/MIME messages and - ** settings can be overridden by use of the \fIsmime-menu\fP. - ** (Crypto only) - */ - {"pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, "yes" }, - /* + ** If \fIset\fP, signed and encrypted messages will consist of nested + ** multipart/signed and multipart/encrypted body parts. ** .pp - ** 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. + ** This is useful for applications like encrypted and signed mailing + ** lists, where the outer layer (multipart/encrypted) can be easily + ** removed, while the inner multipart/signed part is retained. ** (PGP only) */ - {"crypt_replyencrypt", DT_BOOL, R_NONE, OPTCRYPTREPLYENCRYPT, "yes" }, + {"pgp_show_unusable", DT_BOOL, OPTPGPSHOWUNUSABLE, "yes" }, /* ** .pp - ** If \fIset\fP, automatically PGP or OpenSSL encrypt replies to messages which are - ** encrypted. - ** (Crypto only) + ** 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) */ - {"crypt_replysign", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGN, "no" }, + {"pgp_sign_as", DT_STR, UL &PgpSignAs, "" }, /* ** .pp - ** If \fIset\fP, automatically PGP or OpenSSL sign replies to messages which are - ** signed. - ** .pp - ** \fBNote:\fP this does not work on messages that are encrypted \fBand\fP signed! - ** (Crypto only) + ** If you have more than one key pair, this option allows you to specify + ** which of your private keys to use. It is recommended that you use the + ** keyid form to specify your key (e.g., ``\fT0x00112233\fP''). + ** (PGP only) */ - {"crypt_replysignencrypted", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGNENCRYPTED, "no" }, + {"pgp_sort_keys", DT_SORT|DT_SORT_KEYS, UL &PgpSortKeys, "address" }, /* ** .pp - ** If \fIset\fP, automatically PGP or OpenSSL sign replies to messages - ** which are encrypted. This makes sense in combination with - ** ``$$crypt_replyencrypt'', because it allows you to sign all - ** messages which are automatically encrypted. This works around - ** the problem noted in ``$$crypt_replysign'', that Madmutt is not able - ** to find out whether an encrypted message is also signed. - ** (Crypto only) - */ - {"crypt_timestamp", DT_BOOL, R_NONE, OPTCRYPTTIMESTAMP, "yes" }, - /* + ** Specifies how the entries in the ``pgp keys'' menu are sorted. The + ** following are legal values: ** .pp - ** If \fIset\fP, Madmutt will include a time stamp in the lines surrounding - ** PGP or S/MIME output, so spoofing such lines is more difficult. - ** If you are using colors to mark these lines, and rely on these, - ** you may \fIunset\fP this setting. - ** (Crypto only) - */ - {"pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, "no" }, - /* + ** .dl + ** .dt address .dd sort alphabetically by user id + ** .dt keyid .dd sort alphabetically by key id + ** .dt date .dd sort by key creation date + ** .dt trust .dd sort by the trust of the key + ** .de ** .pp - ** If \fIset\fP, Madmutt will use a possibly-running gpg-agent process. + ** If you prefer reverse order of the above values, prefix it with + ** ``reverse-''. ** (PGP only) */ - {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, "yes" }, + {"forward_decrypt", DT_BOOL, OPTFORWDECRYPT, "yes" }, /* ** .pp - ** If ``\fIyes\fP'', always attempt to verify PGP or S/MIME signatures. - ** If ``\fIask\fP'', ask whether or not to verify the signature. - ** If ``\fIno\fP'', never attempt to verify cryptographic signatures. - ** (Crypto only) + ** Controls the handling of encrypted messages when forwarding a message. + ** When \fIset\fP, the outer layer of encryption is stripped off. This + ** variable is only used if ``$$mime_forward'' is \fIset\fP and + ** ``$$mime_forward_decode'' is \fIunset\fP. + ** (PGP only) */ - {"smime_is_default", DT_BOOL, R_NONE, OPTSMIMEISDEFAULT, "no" }, + {"smime_encrypt_with", DT_STR, UL &SmimeCryptAlg, "" }, /* ** .pp - ** 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 Madmutt will automatically - ** select the same application that was used to sign/encrypt the original - ** message. - ** .pp - ** (Note that this variable can be overridden by unsetting $$crypt_autosmime.) - ** (S/MIME only) - */ - {"smime_ask_cert_label", DT_BOOL, R_NONE, OPTASKCERTLABEL, "yes" }, - /* + ** This sets the algorithm that should be used for encryption. + ** Valid choices are ``\fTdes\fP'', ``\fTdes3\fP'', ``\fTrc2-40\fP'', + ** ``\fTrc2-64\fP'', ``\frc2-128\fP''. ** .pp - ** This flag controls whether you want to be asked to enter a label - ** for a certificate about to be added to the database or not. It is - ** \fIset\fP by default. + ** If \fIunset\fP ``\fI3des\fP'' (TripleDES) is used. ** (S/MIME only) */ - {"smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, "yes" }, + {"smime_default_key", DT_STR, UL &SmimeDefaultKey, "" }, /* ** .pp - ** 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. + ** This is the default key-pair to use for signing. This must be set to the + ** keyid (the hash-value that OpenSSL generates) to work properly ** (S/MIME only) */ - {"pgp_entry_format", DT_STR, R_NONE, UL &PgpEntryFormat, "%4n %t%f %4l/0x%k %-4a %2c %u"}, - /* - ** .pp - ** This variable allows you to customize the PGP key selection menu to - ** your personal taste. This string is similar to ``$$index_format'', but - ** has its own set of \fTprintf(3)\fP-like sequences: - ** .pp - ** .dl - ** .dt %n .dd number - ** .dt %k .dd key id - ** .dt %u .dd user id - ** .dt %a .dd algorithm - ** .dt %l .dd key length - ** .dt %f .dd flags - ** .dt %c .dd capabilities - ** .dt %t .dd trust/validity of the key-uid association - ** .dt %[] .dd date of the key where is an \fTstrftime(3)\fP expression - ** .de - ** .pp - ** (PGP only) - */ - {"pgp_good_sign", DT_RX, R_NONE, UL &PgpGoodSign, "" }, - /* - ** .pp - ** If you assign a text to this variable, then a PGP signature is only - ** considered verified if the output from $$pgp_verify_command contains - ** the text. Use this variable if the exit code from the command is 0 - ** even for bad signatures. - ** (PGP only) - */ - {"pgp_check_exit", DT_BOOL, R_NONE, OPTPGPCHECKEXIT, "yes" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will check the exit code of the PGP subprocess when - ** signing or encrypting. A non-zero exit code means that the - ** subprocess failed. - ** (PGP only) - */ - {"pgp_long_ids", DT_BOOL, R_NONE, OPTPGPLONGIDS, "no" }, - /* - ** .pp - ** If \fIset\fP, use 64 bit PGP key IDs. \fIUnset\fP uses the normal 32 bit Key IDs. - ** (PGP only) - */ - {"pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, "no" }, - /* - ** .pp - ** If \fIset\fP, signed and encrypted messages will consist of nested - ** multipart/signed and multipart/encrypted body parts. - ** .pp - ** This is useful for applications like encrypted and signed mailing - ** lists, where the outer layer (multipart/encrypted) can be easily - ** removed, while the inner multipart/signed part is retained. - ** (PGP only) - */ - {"pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, "no" }, - /* - ** .pp - ** 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 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''. - ** .pp - ** Also note that using the old-style PGP message format is \fBstrongly\fP - ** \fBdeprecated\fP. - ** (PGP only) - */ - {"pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, "no" }, - /* - ** .pp - ** 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 Madmutt - ** internals for previously checked/flagged messages. - ** .pp - ** 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''. - ** .pp - ** Also note that using the old-style PGP message format is \fBstrongly\fP - ** \fBdeprecated\fP. - ** (PGP only) - ** - */ - {"pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, "yes" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will display non-usable keys on the PGP key selection - ** menu. This includes keys which have been revoked, have expired, or - ** have been marked as ``disabled'' by the user. - ** (PGP only) - */ - {"pgp_sign_as", DT_STR, R_NONE, UL &PgpSignAs, "" }, - /* - ** .pp - ** If you have more than one key pair, this option allows you to specify - ** which of your private keys to use. It is recommended that you use the - ** keyid form to specify your key (e.g., ``\fT0x00112233\fP''). - ** (PGP only) - */ - {"pgp_strict_enc", DT_BOOL, R_NONE, OPTPGPSTRICTENC, "yes" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will automatically encode PGP/MIME signed messages as - ** \fTquoted-printable\fP. Please note that unsetting this variable may - ** lead to problems with non-verifyable PGP signatures, so only change - ** this if you know what you are doing. - ** (PGP only) - */ - {"pgp_timeout", DT_NUM, R_NONE, UL &PgpTimeout, "300" }, - /* - ** .pp - ** The number of seconds after which a cached passphrase will expire if - ** not used. Default: 300. - ** (PGP only) - */ - {"pgp_sort_keys", DT_SORT|DT_SORT_KEYS, R_NONE, UL &PgpSortKeys, "address" }, - /* - ** .pp - ** Specifies how the entries in the ``pgp keys'' menu are sorted. The - ** following are legal values: - ** .pp - ** .dl - ** .dt address .dd sort alphabetically by user id - ** .dt keyid .dd sort alphabetically by key id - ** .dt date .dd sort by key creation date - ** .dt trust .dd sort by the trust of the key - ** .de - ** .pp - ** If you prefer reverse order of the above values, prefix it with - ** ``reverse-''. - ** (PGP only) - */ - {"pgp_mime_auto", DT_QUAD, R_NONE, OPT_PGPMIMEAUTO, "ask-yes" }, - /* - ** .pp - ** 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 - ** Also note that using the old-style PGP message format is \fBstrongly\fP - ** \fBdeprecated\fP. - ** (PGP only) - */ - {"pgp_auto_decode", DT_BOOL, R_NONE, OPTPGPAUTODEC, "no" }, - /* - ** .pp - ** 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, Madmutt will automatically - ** check the message for traditional pgp. - */ - /* XXX Default values! */ - {"pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, "" }, - /* - ** .pp - ** This format strings specifies a command which is used to decode - ** application/pgp attachments. - ** .pp - ** The PGP command formats have their own set of \fTprintf(3)\fP-like sequences: - ** .pp - ** .dl - ** .dt %p .dd Expands to PGPPASSFD=0 when a pass phrase is needed, to an empty - ** string otherwise. Note: This may be used with a %? construct. - ** .dt %f .dd Expands to the name of a file containing a message. - ** .dt %s .dd Expands to the name of a file containing the signature part - ** . of a multipart/signed attachment when verifying it. - ** .dt %a .dd The value of $$pgp_sign_as. - ** .dt %r .dd One or more key IDs. - ** .de - ** .pp - ** For examples on how to configure these formats for the various versions - ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in - ** the \fTsamples/\fP subdirectory which has been installed on your system - ** alongside the documentation. - ** (PGP only) - */ - {"pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, "" }, - /* - ** .pp - ** This command is invoked whenever Madmutt will need public key information. - ** \fT%r\fP is the only \fTprintf(3)\fP-like sequence used with this format. - ** (PGP only) - */ - {"pgp_verify_command", DT_STR, R_NONE, UL &PgpVerifyCommand, "" }, - /* - ** .pp - ** This command is used to verify PGP signatures. - ** (PGP only) - */ - {"pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, "" }, - /* - ** .pp - ** This command is used to decrypt a PGP encrypted message. - ** (PGP only) - */ - {"pgp_clearsign_command", DT_STR, R_NONE, UL &PgpClearSignCommand, "" }, - /* - ** .pp - ** This format is used to create a old-style ``clearsigned'' PGP message. - ** .pp - ** Note that the use of this format is \fBstrongly\fP \fBdeprecated\fP. - ** (PGP only) - */ - {"pgp_sign_command", DT_STR, R_NONE, UL &PgpSignCommand, "" }, - /* - ** .pp - ** This command is used to create the detached PGP signature for a - ** multipart/signed PGP/MIME body part. - ** (PGP only) - */ - {"pgp_encrypt_sign_command", DT_STR, R_NONE, UL &PgpEncryptSignCommand, "" }, - /* - ** .pp - ** This command is used to both sign and encrypt a body part. - ** (PGP only) - */ - {"pgp_encrypt_only_command", DT_STR, R_NONE, UL &PgpEncryptOnlyCommand, "" }, - /* - ** .pp - ** This command is used to encrypt a body part without signing it. - ** (PGP only) - */ - {"pgp_import_command", DT_STR, R_NONE, UL &PgpImportCommand, "" }, - /* - ** .pp - ** This command is used to import a key from a message into - ** the user's public key ring. - ** (PGP only) - */ - {"pgp_export_command", DT_STR, R_NONE, UL &PgpExportCommand, "" }, - /* - ** .pp - ** This command is used to export a public key from the user's - ** key ring. - ** (PGP only) - */ - {"pgp_verify_key_command", DT_STR, R_NONE, UL &PgpVerifyKeyCommand, "" }, - /* - ** .pp - ** This command is used to verify key information from the key selection - ** menu. - ** (PGP only) - */ - {"pgp_list_secring_command", DT_STR, R_NONE, UL &PgpListSecringCommand, "" }, - /* - ** .pp - ** This command is used to list the secret key ring's contents. The - ** output format must be analogous to the one used by - ** \fTgpg --list-keys --with-colons\fP. - ** .pp - ** This format is also generated by the \fTpgpring\fP utility which comes - ** with Madmutt. - ** (PGP only) - */ - {"pgp_list_pubring_command", DT_STR, R_NONE, UL &PgpListPubringCommand, "" }, - /* - ** .pp - ** This command is used to list the public key ring's contents. The - ** output format must be analogous to the one used by - ** \fTgpg --list-keys --with-colons\fP. - ** .pp - ** This format is also generated by the \fTpgpring\fP utility which comes - ** with Madmutt. - ** (PGP only) - */ - {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, "yes" }, - /* - ** .pp - ** Controls the handling of encrypted messages when forwarding a message. - ** When \fIset\fP, the outer layer of encryption is stripped off. This - ** variable is only used if ``$$mime_forward'' is \fIset\fP and - ** ``$$mime_forward_decode'' is \fIunset\fP. - ** (PGP only) - */ - {"smime_timeout", DT_NUM, R_NONE, UL &SmimeTimeout, "300" }, - /* - ** .pp - ** The number of seconds after which a cached passphrase will expire if - ** not used. - ** (S/MIME only) - */ - {"smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, "" }, - /* - ** .pp - ** This sets the algorithm that should be used for encryption. - ** Valid choices are ``\fTdes\fP'', ``\fTdes3\fP'', ``\fTrc2-40\fP'', - ** ``\fTrc2-64\fP'', ``\frc2-128\fP''. - ** .pp - ** If \fIunset\fP ``\fI3des\fP'' (TripleDES) is used. - ** (S/MIME only) - */ - {"smime_keys", DT_PATH, R_NONE, UL &SmimeKeys, "" }, - /* - ** .pp - ** 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 - ** which contains mailbox-address keyid pair, and which can be manually - ** edited. This one points to the location of the private keys. - ** (S/MIME only) - */ - {"smime_ca_location", DT_PATH, R_NONE, UL &SmimeCALocation, "" }, - /* - ** .pp - ** This variable contains the name of either a directory, or a file which - ** contains trusted certificates for use with OpenSSL. - ** (S/MIME only) - */ - {"smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, "" }, - /* - ** .pp - ** 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 - ** OpenSSL. There is an index file which contains mailbox-address - ** keyid pairs, and which can be manually edited. This one points to - ** the location of the certificates. - ** (S/MIME only) - */ - {"smime_decrypt_command", DT_STR, R_NONE, UL &SmimeDecryptCommand, "" }, - /* - ** .pp - ** This format string specifies a command which is used to decrypt - ** \fTapplication/x-pkcs7-mime\fP attachments. - ** .pp - ** The OpenSSL command formats have their own set of \fTprintf(3)\fP-like sequences - ** similar to PGP's: - ** .pp - ** .dl - ** .dt %f .dd Expands to the name of a file containing a message. - ** .dt %s .dd Expands to the name of a file containing the signature part - ** . of a multipart/signed attachment when verifying it. - ** .dt %k .dd The key-pair specified with $$smime_default_key - ** .dt %c .dd One or more certificate IDs. - ** .dt %a .dd The algorithm used for encryption. - ** .dt %C .dd CA location: Depending on whether $$smime_ca_location - ** . points to a directory or file, this expands to - ** . "-CApath $$smime_ca_location" or "-CAfile $$smime_ca_location". - ** .de - ** .pp - ** For examples on how to configure these formats, see the smime.rc in - ** the \fTsamples/\fP subdirectory which has been installed on your system - ** alongside the documentation. - ** (S/MIME only) - */ - {"smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, "" }, - /* - ** .pp - ** This command is used to verify S/MIME signatures of type \fTmultipart/signed\fP. - ** (S/MIME only) - */ - {"smime_verify_opaque_command", DT_STR, R_NONE, UL &SmimeVerifyOpaqueCommand, "" }, - /* - ** .pp - ** This command is used to verify S/MIME signatures of type - ** \fTapplication/x-pkcs7-mime\fP. - ** (S/MIME only) - */ - {"smime_sign_command", DT_STR, R_NONE, UL &SmimeSignCommand, "" }, - /* - ** .pp - ** This command is used to created S/MIME signatures of type - ** \fTmultipart/signed\fP, which can be read by all mail clients. - ** (S/MIME only) - */ - {"smime_sign_opaque_command", DT_STR, R_NONE, UL &SmimeSignOpaqueCommand, "" }, - /* - ** .pp - ** This command is used to created S/MIME signatures of type - ** \fTapplication/x-pkcs7-signature\fP, which can only be handled by mail - ** clients supporting the S/MIME extension. - ** (S/MIME only) - */ - {"smime_encrypt_command", DT_STR, R_NONE, UL &SmimeEncryptCommand, "" }, - /* - ** .pp - ** This command is used to create encrypted S/MIME messages. - ** (S/MIME only) - */ - {"smime_pk7out_command", DT_STR, R_NONE, UL &SmimePk7outCommand, "" }, - /* - ** .pp - ** This command is used to extract PKCS7 structures of S/MIME signatures, - ** in order to extract the public X509 certificate(s). - ** (S/MIME only) - */ - {"smime_get_cert_command", DT_STR, R_NONE, UL &SmimeGetCertCommand, "" }, - /* - ** .pp - ** This command is used to extract X509 certificates from a PKCS7 structure. - ** (S/MIME only) - */ - {"smime_get_signer_cert_command", DT_STR, R_NONE, UL &SmimeGetSignerCertCommand, "" }, - /* - ** .pp - ** This command is used to extract only the signers X509 certificate from a S/MIME - ** signature, so that the certificate's owner may get compared to the - ** email's ``\fTFrom:\fP'' header field. - ** (S/MIME only) - */ - {"smime_import_cert_command", DT_STR, R_NONE, UL &SmimeImportCertCommand, "" }, - /* - ** .pp - ** This command is used to import a certificate via \fTsmime_keysng\fP. - ** (S/MIME only) - */ - {"smime_get_cert_email_command", DT_STR, R_NONE, UL &SmimeGetCertEmailCommand, "" }, - /* - ** .pp - ** This command is used to extract the mail address(es) used for storing - ** X509 certificates, and for verification purposes (to check whether the - ** certificate was issued for the sender's mailbox). - ** (S/MIME only) - */ - {"smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, "" }, - /* - ** .pp - ** This is the default key-pair to use for signing. This must be set to the - ** keyid (the hash-value that OpenSSL generates) to work properly - ** (S/MIME only) - */ -#if defined(USE_LIBESMTP) - {"smtp_user", DT_STR, R_NONE, UL &SmtpAuthUser, "" }, - /* - ** .pp - ** Availability: SMTP - ** - ** .pp - ** Defines the username to use with SMTP AUTH. Setting this variable will - ** cause Madmutt to attempt to use SMTP AUTH when sending. - */ - {"smtp_pass", DT_STR, R_NONE, UL &SmtpAuthPass, "" }, - /* - ** .pp - ** Availability: SMTP - ** - ** .pp - ** Defines the password to use with SMTP AUTH. If ``$$smtp_user'' - ** is set, but this variable is not, you will be prompted for a password - ** when sending. - ** .pp - ** \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. - */ - {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, "" }, - /* - ** .pp - ** Availability: SMTP - ** - ** .pp - ** Defines the SMTP host which will be used to deliver mail, as opposed - ** to invoking the sendmail binary. Setting this variable overrides the - ** value of ``$$sendmail'', and any associated variables. - */ - {"smtp_port", DT_NUM, R_NONE, UL &SmtpPort, "25" }, - /* - ** .pp - ** Availability: SMTP - ** - ** .pp - ** Defines the port that the SMTP host is listening on for mail delivery. - ** Must be specified as a number. - ** .pp - ** Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP - ** servers will probably desire 587, the mail submission port. - */ - {"smtp_use_tls", DT_STR, R_NONE, UL &SmtpUseTLS, "" }, - /* - ** .pp - ** Availability: SMTP (and SSL) - ** - ** .pp - ** Defines wether to use STARTTLS. If this option is set to ``\fIrequired\fP'' - ** and the server does not support STARTTLS or there is an error in the - ** TLS Handshake, the connection will fail. Setting this to ``\fIenabled\fP'' - ** will try to start TLS and continue without TLS in case of an error. - ** - **.pp - ** Madmutt still needs to have SSL support enabled in order to use it. - */ -#endif -#if defined(USE_SSL) || defined(USE_GNUTLS) -#ifdef USE_SSL - {"ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, "" }, - /* - ** .pp - ** Availability: SSL - ** - ** .pp - ** The file containing a client certificate and its associated private - ** key. - */ -#endif /* USE_SSL */ - {"ssl_force_tls", DT_BOOL, R_NONE, OPTSSLFORCETLS, "no" }, - /* - ** .pp - ** If this variable is \fIset\fP, Madmutt will require that all connections - ** to remote servers be encrypted. Furthermore it will attempt to - ** negotiate TLS even if the server does not advertise the capability, - ** since it would otherwise have to abort the connection anyway. This - ** option supersedes ``$$ssl_starttls''. - */ - {"ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, "yes" }, - /* - ** .pp - ** Availability: SSL or GNUTLS - ** - ** .pp - ** If \fIset\fP (the default), 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"}, - /* - ** .pp - ** Availability: SSL or GNUTLS - ** - ** .pp - ** This variable specifies the file where the certificates you trust - ** are saved. When an unknown certificate is encountered, you are asked - ** if you accept it or not. If you accept it, the certificate can also - ** be saved in this file and further connections are automatically - ** accepted. - ** .pp - ** You can also manually add CA certificates in this file. Any server - ** certificate that is signed with one of these CA certificates are - ** also automatically accepted. - ** .pp - ** Example: \fTset certificate_file=~/.madmutt/certificates\fP - */ -# if defined(_MAKEDOC) || !defined (USE_GNUTLS) - {"ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, "yes" }, - /* - ** .pp - ** Availability: SSL - ** - ** .pp - ** If set to \fIyes\fP, Madmutt will use CA certificates in the - ** system-wide certificate store when checking if server certificate - ** is signed by a trusted CA. - */ - {"entropy_file", DT_PATH, R_NONE, UL &SslEntropyFile, "" }, - /* - ** .pp - ** Availability: SSL - ** - ** .pp - ** The file which includes random data that is used to initialize SSL - ** library functions. - */ - {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "no" }, - /* - ** .pp - ** Availability: SSL - ** - ** .pp - ** This variables specifies whether to attempt to use SSLv2 in the - ** SSL authentication process. - */ -# endif /* _MAKEDOC || !USE_GNUTLS */ - {"ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, "yes" }, - /* - ** .pp - ** Availability: SSL or GNUTLS - ** - ** .pp - ** This variables specifies whether to attempt to use SSLv3 in the - ** SSL authentication process. - */ - {"ssl_use_tlsv1", DT_BOOL, R_NONE, OPTTLSV1, "yes" }, - /* - ** .pp - ** Availability: SSL or GNUTLS - ** - ** .pp - ** This variables specifies whether to attempt to use TLSv1 in the - ** SSL authentication process. - */ -# ifdef USE_GNUTLS - {"ssl_min_dh_prime_bits", DT_NUM, R_NONE, UL &SslDHPrimeBits, "0" }, - /* - ** .pp - ** Availability: GNUTLS - ** - ** .pp - ** This variable specifies the minimum acceptable prime size (in bits) - ** for use in any Diffie-Hellman key exchange. A value of 0 will use - ** the default from the GNUTLS library. - */ - {"ssl_ca_certificates_file", DT_PATH, R_NONE, UL &SslCACertFile, "" }, - /* - ** .pp - ** This variable specifies a file containing trusted CA certificates. - ** Any server certificate that is signed with one of these CA - ** certificates are also automatically accepted. - ** .pp - ** Example: \fTset ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt\fP - */ -# endif /* USE_GNUTLS */ -# endif /* USE_SSL || USE_GNUTLS */ - {"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, "no" }, + {"pipe_split", DT_BOOL, OPTPIPESPLIT, "no" }, /* ** .pp ** Used in connection with the \fIpipe-message\fP command and the ``tag- @@ -2346,7 +1176,7 @@ struct option_t MuttVars[] = { ** In both cases the messages are piped in the current sorted order, ** and the ``$$pipe_sep'' separator is added after each message. */ - {"pipe_decode", DT_BOOL, R_NONE, OPTPIPEDECODE, "no" }, + {"pipe_decode", DT_BOOL, OPTPIPEDECODE, "no" }, /* ** .pp ** Used in connection with the \fIpipe-message\fP command. When \fIunset\fP, @@ -2354,13 +1184,13 @@ struct option_t MuttVars[] = { ** will weed headers and will attempt to PGP/MIME decode the messages ** first. */ - {"pipe_sep", DT_STR, R_NONE, UL &PipeSep, "\n"}, + {"pipe_sep", DT_STR, UL &PipeSep, "\n"}, /* ** .pp ** The separator to add between messages when piping a list of tagged ** messages to an external Unix command. */ - {"pop_authenticators", DT_STR, R_NONE, UL &PopAuthenticators, "" }, + {"pop_authenticators", DT_STR, UL &PopAuthenticators, "" }, /* ** .pp ** This is a colon-delimited list of authentication methods Madmutt may @@ -2374,29 +1204,20 @@ struct option_t MuttVars[] = { ** .pp ** Example: \fTset pop_authenticators="digest-md5:apop:user"\fP */ - {"pop_auth_try_all", DT_BOOL, R_NONE, OPTPOPAUTHTRYALL, "yes" }, - /* - ** .pp - ** 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, Madmutt will not connect to the POP server. - */ - {"pop_checkinterval", DT_SYN, R_NONE, UL "pop_mail_check", 0}, - {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" }, + {"pop_mail_check", DT_NUM, UL &PopCheckTimeout, "60" }, /* ** .pp ** This variable configures how often (in seconds) Madmutt should look for ** new mail. */ - {"pop_delete", DT_QUAD, R_NONE, OPT_POPDELETE, "ask-no" }, + {"pop_delete", DT_QUAD, OPT_POPDELETE, "ask-no" }, /* ** .pp ** 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, ""}, + {"pop_host", DT_STR, UL &PopHost, ""}, /* ** .pp ** The name of your POP server for the ``fetch-mail'' function. You @@ -2408,27 +1229,27 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ - {"pop_last", DT_BOOL, R_NONE, OPTPOPLAST, "no" }, + {"pop_last", DT_BOOL, OPTPOPLAST, "no" }, /* ** .pp ** 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" }, + {"pop_reconnect", DT_QUAD, OPT_POPRECONNECT, "ask-yes" }, /* ** .pp ** 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, "" }, + {"pop_user", DT_STR, UL &PopUser, "" }, /* ** .pp ** Your login name on the POP server. ** .pp ** This variable defaults to your user name on the local machine. */ - {"pop_pass", DT_STR, R_NONE, UL &PopPass, ""}, + {"pop_pass", DT_STR, UL &PopPass, ""}, /* ** .pp ** Specifies the password for your POP account. If \fIunset\fP, Madmutt will @@ -2438,34 +1259,13 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ - {"post_indent_string", DT_STR, R_NONE, UL &PostIndentString, ""}, - /* - ** .pp - ** Similar to the ``$$attribution'' variable, Madmutt will append this - ** string after the inclusion of a message which is being replied to. - */ -#ifdef USE_NNTP - {"nntp_post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** 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 - ** does not support posting to that newsgroup or a group is totally read-only, that - ** posting will not have any effect. - */ -#endif - {"postpone", DT_QUAD, R_NONE, OPT_POSTPONE, "ask-yes" }, + {"postpone", DT_QUAD, OPT_POSTPONE, "ask-yes" }, /* ** .pp ** Controls whether or not messages are saved in the ``$$postponed'' ** mailbox when you elect not to send immediately. */ - {"postponed", DT_PATH, R_NONE, UL &Postponed, "~/postponed"}, + {"postponed", DT_PATH, UL &Postponed, "~/postponed"}, /* ** .pp ** Madmutt allows you to indefinitely ``$postpone sending a message'' which @@ -2473,7 +1273,7 @@ struct option_t MuttVars[] = { ** in the mailbox specified by this variable. Also see the ``$$postpone'' ** variable. */ - {"preconnect", DT_STR, R_NONE, UL &Preconnect, "" }, + {"preconnect", DT_STR, UL &Preconnect, "" }, /* ** .pp ** If \fIset\fP, a shell command to be executed if Madmutt fails to establish @@ -2490,19 +1290,19 @@ struct option_t MuttVars[] = { ** \fBNote:\fP For this example to work, you must be able to log in to the ** remote machine without having to enter a password. */ - {"print", DT_QUAD, R_NONE, OPT_PRINT, "ask-no" }, + {"print", DT_QUAD, OPT_PRINT, "ask-no" }, /* ** .pp ** Controls whether or not Madmutt really prints messages. ** This is set to \fIask-no\fP by default, because some people ** accidentally hit ``p'' often. */ - {"print_command", DT_PATH, R_NONE, UL &PrintCmd, "lpr"}, + {"print_command", DT_PATH, UL &PrintCmd, "lpr"}, /* ** .pp ** This specifies the command pipe that should be used to print messages. */ - {"print_decode", DT_BOOL, R_NONE, OPTPRINTDECODE, "yes" }, + {"print_decode", DT_BOOL, OPTPRINTDECODE, "yes" }, /* ** .pp ** Used in connection with the print-message command. If this @@ -2513,7 +1313,7 @@ struct option_t MuttVars[] = { ** some advanced printer filter which is able to properly format ** e-mail messages for printing. */ - {"print_split", DT_BOOL, R_NONE, OPTPRINTSPLIT, "no" }, + {"print_split", DT_BOOL, OPTPRINTSPLIT, "no" }, /* ** .pp ** Used in connection with the print-message command. If this option @@ -2526,7 +1326,7 @@ struct option_t MuttVars[] = { ** Those who use the \fTenscript(1)\fP program's mail-printing mode will ** most likely want to set this option. */ - {"prompt_after", DT_BOOL, R_NONE, OPTPROMPTAFTER, "yes" }, + {"prompt_after", DT_BOOL, OPTPROMPTAFTER, "yes" }, /* ** .pp ** If you use an \fIexternal\fP ``$$pager'', setting this variable will @@ -2534,7 +1334,7 @@ struct option_t MuttVars[] = { ** 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, ""}, + {"query_command", DT_PATH, UL &QueryCmd, ""}, /* ** .pp ** This specifies the command that Madmutt will use to make external address @@ -2542,20 +1342,20 @@ struct option_t MuttVars[] = { ** with the query string the user types. See ``$query'' for more ** information. */ - {"quote_empty", DT_BOOL, R_NONE, OPTQUOTEEMPTY, "yes" }, + {"quote_empty", DT_BOOL, OPTQUOTEEMPTY, "yes" }, /* ** .pp ** Controls whether or not empty lines will be quoted using ** ``$indent_string''. */ - {"quote_quoted", DT_BOOL, R_NONE, OPTQUOTEQUOTED, "no" }, + {"quote_quoted", DT_BOOL, OPTQUOTEQUOTED, "no" }, /* ** .pp ** Controls how quoted lines will be quoted. If \fIset\fP, one quote ** character will be added to the end of existing prefix. Otherwise, ** quoted lines will be prepended by ``$indent_string''. */ - {"quote_regexp", DT_RX, R_PAGER, UL &QuoteRegexp, "^([ \t]*[|>:}#])+"}, + {"quote_regexp", DT_RX, UL &QuoteRegexp, "^([ \t]*[|>:}#])+"}, /* ** .pp ** A regular expression used in the internal-pager to determine quoted @@ -2566,7 +1366,7 @@ struct option_t MuttVars[] = { ** matches \fIexactly\fP the quote characters at the beginning of quoted ** lines. */ - {"read_inc", DT_NUM, R_NONE, UL &ReadInc, "10" }, + {"read_inc", DT_NUM, UL &ReadInc, "10" }, /* ** .pp ** If set to a value greater than 0, Madmutt will display which message it @@ -2580,12 +1380,7 @@ struct option_t MuttVars[] = { ** .pp ** Also see the ``$$write_inc'' variable. */ - {"read_only", DT_BOOL, R_NONE, OPTREADONLY, "no" }, - /* - ** .pp - ** If set, all folders are opened in read-only mode. - */ - {"realname", DT_STR, R_BOTH, UL &Realname, "" }, + {"realname", DT_STR, UL &Realname, "" }, /* ** .pp ** This variable specifies what ``real'' or ``personal'' name should be used @@ -2597,7 +1392,7 @@ struct option_t MuttVars[] = { ** variable will \fInot\fP be used when the user has set a real name ** in the $$from variable. */ - {"recall", DT_QUAD, R_NONE, OPT_RECALL, "ask-yes" }, + {"recall", DT_QUAD, OPT_RECALL, "ask-yes" }, /* ** .pp ** Controls whether or not Madmutt recalls postponed messages @@ -2606,32 +1401,14 @@ struct option_t MuttVars[] = { ** Setting this variable to \fIyes\fP is not generally useful, and thus not ** recommended. */ - {"record", DT_PATH, R_NONE, UL &Outbox, ""}, - /* - ** .pp - ** This specifies the file into which your outgoing messages should be - ** appended. (This is meant as the primary method for saving a copy of - ** your messages, but another way to do this is using the ``$my_hdr'' - ** command to create a \fTBcc:\fP header field with your email address in it.) - ** .pp - ** The value of \fI$$record\fP is overridden by the ``$$force_name'' and - ** ``$$save_name'' variables, and the ``$fcc-hook'' command. - */ - {"reply_regexp", DT_RX, R_INDEX|R_RESORT, UL &ReplyRegexp, "^(re([\\[0-9\\]+])*|aw):[ \t]*"}, + {"reply_regexp", DT_RX, UL &ReplyRegexp, "^(re([\\[0-9\\]+])*|aw):[ \t]*"}, /* ** .pp ** A regular expression used to recognize reply messages when threading ** and replying. The default value corresponds to the English ``Re:'' and ** the German ``Aw:''. */ - {"reply_self", DT_BOOL, R_NONE, OPTREPLYSELF, "no" }, - /* - ** .pp - ** 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" }, + {"reply_to", DT_QUAD, OPT_REPLYTO, "ask-yes" }, /* ** .pp ** If \fIset\fP, when replying to a message, Madmutt will use the address listed @@ -2643,14 +1420,14 @@ struct option_t MuttVars[] = { ** header field to the list address and you want to send a private ** message to the author of a message. */ - {"resolve", DT_BOOL, R_NONE, OPTRESOLVE, "yes" }, + {"resolve", DT_BOOL, OPTRESOLVE, "yes" }, /* ** .pp ** When set, the cursor will be automatically advanced to the next ** (possibly undeleted) message whenever a command that modifies the ** current message is executed. */ - {"reverse_alias", DT_BOOL, R_BOTH, OPTREVALIAS, "no" }, + {"reverse_alias", DT_BOOL, OPTREVALIAS, "no" }, /* ** .pp ** This variable controls whether or not Madmutt will display the ``personal'' @@ -2668,7 +1445,7 @@ struct option_t MuttVars[] = { ** ``abd30425@somewhere.net.'' This is useful when the person's e-mail ** address is not human friendly (like CompuServe addresses). */ - {"reverse_name", DT_BOOL, R_BOTH, OPTREVNAME, "no" }, + {"reverse_name", DT_BOOL, OPTREVNAME, "no" }, /* ** .pp ** It may sometimes arrive that you receive mail to a certain machine, @@ -2680,7 +1457,7 @@ struct option_t MuttVars[] = { ** used doesn't match your alternates, the \fTFrom:\fP line will use ** your address on the current machine. */ - {"reverse_realname", DT_BOOL, R_BOTH, OPTREVREAL, "yes" }, + {"reverse_realname", DT_BOOL, OPTREVREAL, "yes" }, /* ** .pp ** This variable fine-tunes the behaviour of the $reverse_name feature. @@ -2688,100 +1465,7 @@ struct option_t MuttVars[] = { ** possibly including eventual real names. When it is \fIunset\fP, Madmutt will ** override any such real names with the setting of the $realname variable. */ - {"save_address", DT_BOOL, R_NONE, OPTSAVEADDRESS, "no" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will take the sender's full address when choosing a - ** default folder for saving a mail. If ``$$save_name'' or ``$$force_name'' - ** is \fIset\fP too, the selection of the fcc folder will be changed as well. - */ - {"save_empty", DT_BOOL, R_NONE, OPTSAVEEMPTY, "yes" }, - /* - ** .pp - ** When \fIunset\fP, mailboxes which contain no saved messages will be removed - ** when closed (the exception is ``$$spoolfile'' which is never removed). - ** If \fIset\fP, mailboxes are never removed. - ** .pp - ** \fBNote:\fP This only applies to mbox and MMDF folders, Madmutt does not - ** delete MH and Maildir directories. - */ - {"save_name", DT_BOOL, R_NONE, OPTSAVENAME, "no" }, - /* - ** .pp - ** This variable controls how copies of outgoing messages are saved. - ** When set, a check is made to see if a mailbox specified by the - ** recipient address exists (this is done by searching for a mailbox in - ** the ``$$folder'' directory with the \fIusername\fP part of the - ** recipient address). If the mailbox exists, the outgoing message will - ** be saved to that mailbox, otherwise the message is saved to the - ** ``$$record'' mailbox. - ** .pp - ** Also see the ``$$force_name'' variable. - */ - {"score", DT_BOOL, R_NONE, OPTSCORE, "yes" }, - /* - ** .pp - ** When this variable is \fIunset\fP, scoring is turned off. This can - ** be useful to selectively disable scoring for certain folders when the - ** ``$$score_threshold_delete'' variable and friends are used. - ** - */ - {"score_threshold_delete", DT_NUM, R_NONE, UL &ScoreThresholdDelete, "-1" }, - /* - ** .pp - ** Messages which have been assigned a score equal to or lower than the value - ** of this variable are automatically marked for deletion by 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" }, - /* - ** .pp - ** Messages which have been assigned a score greater than or equal to this - ** variable's value are automatically marked ``flagged''. - */ - {"score_threshold_read", DT_NUM, R_NONE, UL &ScoreThresholdRead, "-1" }, - /* - ** .pp - ** Messages which have been assigned a score equal to or lower than the value - ** of this variable are automatically marked as read by Madmutt. Since - ** Madmutt scores are always greater than or equal to zero, the default setting - ** of this variable will never mark a message read. - */ -#ifdef USE_NNTP - {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, "no" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** When \fIset\fP, info about unsubscribed newsgroups will be saved into the - ** ``newsrc'' file and into the news cache. - */ -#endif -#ifdef USE_NNTP - {"nntp_show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, "yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, the newsserver will be asked for new newsgroups on entering - ** the browser. Otherwise, it will be done only once for a newsserver. - ** Also controls whether or not the number of new articles of subscribed - ** newsgroups will be checked. - */ - {"nntp_show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, "no" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, only subscribed newsgroups that contain unread articles - ** will be displayed in the newsgroup browser. - */ -#endif - {"sig_dashes", DT_BOOL, R_NONE, OPTSIGDASHES, "yes" }, + {"sig_dashes", DT_BOOL, OPTSIGDASHES, "yes" }, /* ** .pp ** If set, a line containing ``\fT-- \fP'' (dash, dash, space) @@ -2793,23 +1477,7 @@ struct option_t MuttVars[] = { ** 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" }, - /* - ** .pp - ** If \fIset\fP, the signature will be included before any quoted or forwarded - ** text. It is \fBstrongly\fP recommended that you do not set this variable - ** unless you really know what you are doing, and are prepared to take - ** some heat from netiquette guardians. - */ - {"signature", DT_PATH, R_NONE, UL &Signature, "~/.signature"}, - /* - ** .pp - ** Specifies the filename of your signature, which is appended to all - ** outgoing messages. If the filename ends with a pipe (``\fT|\fP''), it is - ** assumed that filename is a shell command and input should be read from - ** its stdout. - */ - {"signoff_string", DT_STR, R_NONE, UL &SignOffString, "" }, + {"signoff_string", DT_STR, UL &SignOffString, "" }, /* ** .pp ** If \fIset\fP, this string will be inserted before the signature. This is useful @@ -2819,7 +1487,7 @@ struct option_t MuttVars[] = { ** witty quotes into your mails, better use a signature file instead of ** the signoff string. */ - {"simple_search", DT_STR, R_NONE, UL &SimpleSearch, "~f %s | ~s %s"}, + {"simple_search", DT_STR, UL &SimpleSearch, "~f %s | ~s %s"}, /* ** .pp ** Specifies how Madmutt should expand a simple search into a real search @@ -2832,7 +1500,7 @@ struct option_t MuttVars[] = { ** .pp ** \fT~f joe | ~s joe\fP */ - {"smart_wrap", DT_BOOL, R_PAGER, OPTWRAP, "yes" }, + {"smart_wrap", DT_BOOL, OPTWRAP, "yes" }, /* ** .pp ** Controls the display of lines longer than the screen width in the @@ -2840,14 +1508,14 @@ struct option_t MuttVars[] = { ** If \fIunset\fP, lines are simply wrapped at the screen edge. Also see the ** ``$$markers'' variable. */ - {"smileys", DT_RX, R_PAGER, UL &Smileys, "(>From )|(:[-^]?[][)(><}{|/DP])"}, + {"smileys", DT_RX, UL &Smileys, "(>From )|(:[-^]?[][)(><}{|/DP])"}, /* ** .pp ** The \fIpager\fP uses this variable to catch some common false ** positives of ``$$quote_regexp'', most notably smileys in the beginning ** of a line */ - {"sleep_time", DT_NUM, R_NONE, UL &SleepTime, "1" }, + {"sleep_time", DT_NUM, UL &SleepTime, "1" }, /* ** .pp ** Specifies time, in seconds, to pause while displaying certain informational @@ -2855,7 +1523,7 @@ struct option_t MuttVars[] = { ** messages from the current folder. The default is to pause one second, so ** a value of zero for this option suppresses the pause. */ - {"sort", DT_SORT, R_INDEX|R_RESORT, UL &Sort, "date" }, + {"sort", DT_SORT, UL &Sort, "date" }, /* ** .pp ** Specifies how to sort messages in the \fIindex\fP menu. Valid values @@ -2877,7 +1545,7 @@ struct option_t MuttVars[] = { ** You may optionally use the ``reverse-'' prefix to specify reverse sorting ** order (example: \fTset sort=reverse-date-sent\fP). */ - {"sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, "alias" }, + {"sort_alias", DT_SORT|DT_SORT_ALIAS, UL &SortAlias, "alias" }, /* ** .pp ** Specifies how the entries in the ``alias'' menu are sorted. The @@ -2889,7 +1557,7 @@ struct option_t MuttVars[] = { ** . unsorted (leave in order specified in .muttrc) ** .te */ - {"sort_aux", DT_SORT|DT_SORT_AUX, R_INDEX|R_RESORT_BOTH, UL &SortAux, "date" }, + {"sort_aux", DT_SORT|DT_SORT_AUX, UL &SortAux, "date" }, /* ** .pp ** When sorting by threads, this variable controls how threads are sorted @@ -2909,7 +1577,7 @@ struct option_t MuttVars[] = { ** (which is not the right thing to do, but kept to not break any existing ** configuration setting). */ - {"sort_browser", DT_SORT|DT_SORT_BROWSER, R_NONE, UL &BrowserSort, "alpha" }, + {"sort_browser", DT_SORT|DT_SORT_BROWSER, UL &BrowserSort, "alpha" }, /* ** .pp ** Specifies how to sort entries in the file browser. By default, the @@ -2925,7 +1593,7 @@ struct option_t MuttVars[] = { ** You may optionally use the ``reverse-'' prefix to specify reverse sorting ** order (example: \fTset sort_browser=reverse-date\fP). */ - {"sort_re", DT_BOOL, R_INDEX|R_RESORT|R_RESORT_INIT, OPTSORTRE, "yes" }, + {"sort_re", DT_BOOL, OPTSORTRE, "yes" }, /* ** .pp ** This variable is only useful when sorting by threads with @@ -2937,7 +1605,7 @@ struct option_t MuttVars[] = { ** Madmutt will attach the message whether or not this is the case, ** as long as the non-``$$reply_regexp'' parts of both messages are identical. */ - {"spoolfile", DT_PATH, R_NONE, UL &Spoolfile, "" }, + {"spoolfile", DT_PATH, UL &Spoolfile, "" }, /* ** .pp ** If your spool mailbox is in a non-default place where Madmutt cannot find @@ -2945,7 +1613,7 @@ struct option_t MuttVars[] = { ** automatically set this variable to the value of the environment ** variable $$$MAIL if it is not set. */ - {"status_chars", DT_STR, R_BOTH, UL &StChars, "-*%A"}, + {"status_chars", DT_STR, UL &StChars, "-*%A"}, /* ** .pp ** Controls the characters used by the ``\fT%r\fP'' indicator in @@ -2959,7 +1627,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-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)---"}, + {"status_format", DT_STR, 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 @@ -3032,13 +1700,7 @@ struct option_t MuttVars[] = { ** will replace any dots in the expansion by underscores. This might be helpful ** with IMAP folders that don't like dots in folder names. */ - {"status_on_top", DT_BOOL, R_BOTH, OPTSTATUSONTOP, "no" }, - /* - ** .pp - ** Setting this variable causes the ``status bar'' to be displayed on - ** the first line of the screen rather than near the bottom. - */ - {"strict_mailto", DT_BOOL, R_NONE, OPTSTRICTMAILTO, "yes" }, + {"strict_mailto", DT_BOOL, OPTSTRICTMAILTO, "yes" }, /* ** ** .pp @@ -3052,7 +1714,7 @@ struct option_t MuttVars[] = { ** ``X-Mailto-'' and the message including headers will be shown in the editor ** regardless of what ``$$edit_headers'' is set to. **/ - {"strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, "no" }, + {"strict_threads", DT_BOOL, OPTSTRICTTHREADS, "no" }, /* ** .pp ** If \fIset\fP, threading will only make use of the ``\fTIn-Reply-To:\fP'' and @@ -3064,35 +1726,28 @@ struct option_t MuttVars[] = { ** ``$$sort_re'' for a less drastic way of controlling this ** behaviour. */ - {"strip_was", DT_BOOL, R_NONE, OPTSTRIPWAS, "no" }, + {"strip_was", DT_BOOL, OPTSTRIPWAS, "no" }, /** ** .pp ** 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]: .*\\)[ ]*$"}, + {"strip_was_regex", DT_RX, UL &StripWasRegexp, "\\([Ww][Aa][RrSs]: .*\\)[ ]*$"}, /** ** .pp ** When non-empty and $$strip_was is \fIset\fP, Madmutt will remove this ** trailing part of the ``Subject'' line when replying if it won't be empty ** afterwards. **/ - {"stuff_quoted", DT_BOOL, R_BOTH, OPTSTUFFQUOTED, "no" }, + {"stuff_quoted", DT_BOOL, OPTSTUFFQUOTED, "no" }, /* ** .pp ** If \fIset\fP, attachments with flowed format will have their quoting ``stuffed'', ** i.e. a space will be inserted between the quote characters and the actual ** text. */ - {"suspend", DT_BOOL, R_NONE, OPTSUSPEND, "yes" }, - /* - ** .pp - ** 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" }, + {"text_flowed", DT_BOOL, OPTTEXTFLOWED, "no" }, /* ** .pp ** When \fIset\fP, Madmutt will generate \fTtext/plain; format=flowed\fP attachments. @@ -3102,13 +1757,13 @@ struct option_t MuttVars[] = { ** .pp ** Note that $$indent_string is ignored when this option is set. */ - {"thread_received", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTTHREADRECEIVED, "no" }, + {"thread_received", DT_BOOL, OPTTHREADRECEIVED, "no" }, /* ** .pp ** 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" }, + {"thorough_search", DT_BOOL, OPTTHOROUGHSRC, "no" }, /* ** .pp ** Affects the \fT~b\fP and \fT~h\fP search operations described in @@ -3116,13 +1771,13 @@ struct option_t MuttVars[] = { ** messages to be searched are decoded before searching. If \fIunset\fP, ** messages are searched as they appear in the folder. */ - {"tilde", DT_BOOL, R_PAGER, OPTTILDE, "no" }, + {"tilde", DT_BOOL, OPTTILDE, "no" }, /* ** .pp ** When \fIset\fP, the internal-pager will pad blank lines to the bottom of the ** screen with a tilde (~). */ - {"timeout", DT_NUM, R_NONE, UL &Timeout, "600" }, + {"timeout", DT_NUM, UL &Timeout, "600" }, /* ** .pp ** This variable controls the \fInumber of seconds\fP Madmutt will wait @@ -3130,7 +1785,7 @@ struct option_t MuttVars[] = { ** checking for new mail. A value of zero or less will cause Madmutt ** to never time out. */ - {"to_chars", DT_STR, R_BOTH, UL &Tochars, " +TCFL"}, + {"to_chars", DT_STR, UL &Tochars, " +TCFL"}, /* ** .pp ** Controls the character used to indicate mail addressed to you. The @@ -3144,7 +1799,7 @@ struct option_t MuttVars[] = { ** by \fIyou\fP. The sixth character is used to indicate when a mail ** was sent to a mailing-list you're subscribe to (default: L). */ - {"trash", DT_PATH, R_NONE, UL &TrashPath, "" }, + {"trash", DT_PATH, UL &TrashPath, "" }, /* ** .pp ** If \fIset\fP, this variable specifies the path of the trash folder where the @@ -3154,7 +1809,7 @@ 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. */ - {"tunnel", DT_STR, R_NONE, UL &Tunnel, "" }, + {"tunnel", DT_STR, UL &Tunnel, "" }, /* ** .pp ** Setting this variable will cause Madmutt to open a pipe to a command @@ -3166,13 +1821,13 @@ 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. */ - {"umask", DT_NUM, R_NONE, UL &Umask, "0077" }, + {"umask", DT_NUM, UL &Umask, "0077" }, /* ** .pp ** 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_from", DT_BOOL, R_NONE, OPTUSEFROM, "yes" }, + {"use_from", DT_BOOL, OPTUSEFROM, "yes" }, /* ** .pp ** When \fIset\fP, Madmutt will generate the ``\fTFrom:\fP'' header field when @@ -3181,7 +1836,7 @@ struct option_t MuttVars[] = { ** command. */ #ifdef HAVE_LIBIDN - {"use_idn", DT_BOOL, R_BOTH, OPTUSEIDN, "yes" }, + {"use_idn", DT_BOOL, OPTUSEIDN, "yes" }, /* ** .pp ** Availability: IDN @@ -3193,24 +1848,14 @@ struct option_t MuttVars[] = { ** This variable only affects decoding. */ #endif /* HAVE_LIBIDN */ -#ifdef HAVE_GETADDRINFO - {"use_ipv6", DT_BOOL, R_NONE, OPTUSEIPV6, "yes" }, - /* - ** .pp - ** When \fIset\fP, Madmutt will look for IPv6 addresses of hosts it tries to - ** contact. If this option is \fIunset\fP, Madmutt will restrict itself to IPv4 addresses. - ** Normally, the default should work. - */ -#endif /* HAVE_GETADDRINFO */ - {"user_agent", DT_SYN, R_NONE, UL "agent_string", 0 }, - {"agent_string", DT_BOOL, R_NONE, OPTXMAILER, "yes" }, + {"agent_string", DT_BOOL, OPTXMAILER, "yes" }, /* ** .pp ** When \fIset\fP, Madmutt will add a ``\fTUser-Agent:\fP'' header to outgoing ** messages, indicating which version of Madmutt was used for composing ** them. */ - {"wait_key", DT_BOOL, R_NONE, OPTWAITKEY, "yes" }, + {"wait_key", DT_BOOL, OPTWAITKEY, "yes" }, /* ** .pp ** Controls whether Madmutt will ask you to press a key after \fIshell- @@ -3224,13 +1869,13 @@ struct option_t MuttVars[] = { ** 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" }, + {"weed", DT_BOOL, OPTWEED, "yes" }, /* ** .pp ** When \fIset\fP, Madmutt will weed headers when displaying, forwarding, ** printing, or replying to messages. */ - {"wrap_search", DT_BOOL, R_NONE, OPTWRAPSEARCH, "yes" }, + {"wrap_search", DT_BOOL, OPTWRAPSEARCH, "yes" }, /* ** .pp ** Controls whether searches wrap around the end of the mailbox. @@ -3238,13 +1883,13 @@ struct option_t MuttVars[] = { ** When \fIset\fP, searches will wrap around the first (or last) message. When ** \fIunset\fP, searches will not wrap. */ - {"wrapmargin", DT_NUM, R_PAGER, UL &WrapMargin, "0" }, + {"wrapmargin", DT_NUM, UL &WrapMargin, "0" }, /* ** .pp ** Controls the size of the margin remaining at the right side of ** the terminal when Madmutt's pager does smart wrapping. */ - {"write_inc", DT_NUM, R_NONE, UL &WriteInc, "10" }, + {"write_inc", DT_NUM, UL &WriteInc, "10" }, /* ** .pp ** When writing a mailbox, a message will be printed every @@ -3253,27 +1898,27 @@ struct option_t MuttVars[] = { ** .pp ** Also see the ``$$read_inc'' variable. */ - {"write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, "yes" }, + {"write_bcc", DT_BOOL, OPTWRITEBCC, "yes" }, /* ** .pp ** 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?"}, + {"xterm_icon", DT_STR, UL &XtermIcon, "M%?n?AIL&ail?"}, /* ** .pp ** Controls the format of the X11 icon title, as long as $$xterm_set_titles ** is \fIset\fP. This string is identical in formatting to the one used by ** ``$$status_format''. */ - {"xterm_set_titles", DT_BOOL, R_BOTH, OPTXTERMSETTITLES, "no" }, + {"xterm_set_titles", DT_BOOL, OPTXTERMSETTITLES, "no" }, /* ** .pp ** Controls whether Madmutt sets the xterm title bar and icon name ** (as long as you're in an appropriate terminal). The default must ** be \fIunset\fP to force in the validity checking. */ - {"xterm_leave", DT_STR, R_BOTH, UL &XtermLeave, "" }, + {"xterm_leave", DT_STR, UL &XtermLeave, "" }, /* ** .pp ** If $$xterm_set_titles is \fIset\fP, this string will be used to @@ -3287,27 +1932,15 @@ 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, "Madmutt with %?m?%m messages&no messages?%?n? [%n New]?"}, + {"xterm_title", DT_STR, 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 ** $$xterm_set_titles has been \fIset\fP. This string is identical in formatting ** to the one used by ``$$status_format''. */ -#ifdef USE_NNTP - {"nntp_x_comment_to", DT_BOOL, R_NONE, OPTXCOMMENTTO, "no" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** 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, -1, R_NONE, -1, NULL } + { NULL, -1, -1, NULL } }; const struct mapping_t SortMethods[] = { @@ -3371,14 +2004,10 @@ const struct mapping_t SortKeyMethods[] = { /* functions used to parse commands in a rc file */ -static int parse_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_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_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_set (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_my_hdr (BUFFER *, BUFFER *, unsigned long, BUFFER *); @@ -3394,7 +2023,6 @@ struct command_t Commands[] = { {"bind", mutt_parse_bind, 0}, {"color", mutt_parse_color, 0}, {"exec", mutt_parse_exec, 0}, - {"account-hook", mutt_parse_hook, M_ACCOUNTHOOK}, {"append-hook", mutt_parse_hook, M_APPENDHOOK}, {"close-hook", mutt_parse_hook, M_CLOSEHOOK}, {"crypt-hook", mutt_parse_hook, M_CRYPTHOOK}, @@ -3410,17 +2038,11 @@ struct command_t Commands[] = { {"send2-hook", mutt_parse_hook, M_SEND2HOOK}, {"send-hook", mutt_parse_hook, M_SENDHOOK}, {"macro", mutt_parse_macro, 0}, - {"mono", mutt_parse_mono, 0}, {"push", mutt_parse_push, 0}, - {"score", mutt_parse_score, 0}, {"uncolor", mutt_parse_uncolor, 0}, {"unhook", mutt_parse_unhook, 0}, - {"unmono", mutt_parse_unmono, 0}, - {"unscore", mutt_parse_unscore, 0}, {"alias", parse_alias, 0}, {"attachments", parse_attachments, 0 }, - {"ignore", parse_ignore, 0}, - {"hdr_order", parse_list, UL &HeaderOrderList}, {"my_hdr", parse_my_hdr, 0}, {"reset", parse_set, M_SET_RESET}, {"set", parse_set, 0}, @@ -3429,8 +2051,6 @@ struct command_t Commands[] = { {"source", parse_source, 0}, {"unalias", parse_unalias, 0}, {"unattachments", parse_unattachments, 0}, - {"unignore", parse_unignore, 0}, - {"unhdr_order", parse_unlist, UL &HeaderOrderList}, {"unmy_hdr", parse_unmy_hdr, 0}, {NULL, NULL, 0} };