X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=136876f3b6251c5a75303f727672f73b44895579;hp=3f149ca6cd8a061a20131b3aefae4d6548f07dda;hb=05e61a9707a6da5c0bca77aa7c3c019a918494de;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23 diff --git a/init.h b/init.h index 3f149ca..136876f 100644 --- a/init.h +++ b/init.h @@ -19,7 +19,6 @@ #include "buffy.h" #include "mutt.h" -#include "version.h" #ifndef _MAKEDOC #define DT_MASK 0x0f @@ -33,8 +32,6 @@ #define DT_MAGIC 8 /* mailbox type */ #define DT_SYN 9 /* synonym for another variable */ #define DT_ADDR 10 /* e-mail address */ -#define DT_USER 11 /* user defined via $user_ */ -#define DT_SYS 12 /* pre-defined via $madmutt_ */ #define DTYPE(x) ((x) & DT_MASK) @@ -54,11 +51,13 @@ #define R_NONE 0 #define R_INDEX (1<<0) #define R_PAGER (1<<1) +#define R_BOTH (R_INDEX|R_PAGER) + +/* TODO:MC: will go in the the thread module */ #define R_RESORT (1<<2) /* resort the mailbox */ #define R_RESORT_SUB (1<<3) /* resort subthreads */ #define R_RESORT_INIT (1<<4) /* resort from scratch */ #define R_TREE (1<<5) /* redraw the thread tree */ -#define R_BOTH (R_INDEX|R_PAGER) #define R_RESORT_BOTH (R_RESORT|R_RESORT_SUB) struct option_t { @@ -80,9 +79,6 @@ struct option_t { /* build complete documentation */ #ifdef _MAKEDOC -# ifndef MIXMASTER -# define MIXMASTER "mixmaster" -# endif # ifndef USE_SSL # define USE_SSL # endif @@ -95,9 +91,6 @@ struct option_t { # ifndef USE_GNUTLS # define USE_GNUTLS # endif -# ifndef USE_DOTLOCK -# define USE_DOTLOCK -# endif # ifndef USE_HCACHE # define USE_HCACHE # endif @@ -145,29 +138,6 @@ struct option_t MuttVars[] = { ** check only happens after the \fIfirst\fP edit of the file). When set ** to \fIno\fP, composition will never be aborted. */ - {"alias_file", DT_PATH, R_NONE, UL &AliasFile, "~/.madmuttrc"}, - /* - ** .pp - ** The default file in which to save aliases created by the - ** ``$create-alias'' function. - ** .pp - ** \fBNote:\fP Madmutt will not automatically source this file; you must - ** explicitly use the ``$source'' command for it to be executed. - */ - {"alias_format", DT_STR, R_NONE, UL &AliasFmt, "%4n %2f %t %-10a %r"}, - /* - ** .pp - ** Specifies the format of the data displayed for the ``alias'' menu. The - ** following \fTprintf(3)\fP-style sequences are available: - ** .pp - ** .dl - ** .dt %a .dd alias name - ** .dt %f .dd flags - currently, a "d" for an alias marked for deletion - ** .dt %n .dd index number - ** .dt %r .dd address which alias expands to - ** .dt %t .dd character which indicates if the alias is tagged for inclusion - ** .de - */ {"allow_8bit", DT_BOOL, R_NONE, OPTALLOW8BIT, "yes" }, /* ** .pp @@ -177,7 +147,7 @@ struct option_t MuttVars[] = { {"allow_ansi", DT_BOOL, R_NONE, OPTALLOWANSI, "no" }, /* ** .pp - ** Controls whether ANSI color codes in messages (and color tags in + ** 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 @@ -326,18 +296,6 @@ struct option_t MuttVars[] = { ** unset, you must first use the ``tag-prefix'' function (default: "\fT;\fP") to ** make the next function apply to all tagged messages. */ - {"beep", DT_BOOL, R_NONE, OPTBEEP, "yes" }, - /* - ** .pp - ** When this variable is \fIset\fP, Madmutt will beep when an error occurs. - */ - {"beep_new", DT_BOOL, R_NONE, OPTBEEPNEW, "no" }, - /* - ** .pp - ** When this variable is \fIset\fP, Madmutt will beep whenever it prints a message - ** notifying you of new mail. This is independent of the setting of the - ** ``$$beep'' variable. - */ {"bounce", DT_QUAD, R_NONE, OPT_BOUNCE, "ask-yes" }, /* ** .pp @@ -349,7 +307,7 @@ struct option_t MuttVars[] = { {"bounce_delivered", DT_BOOL, R_NONE, OPTBOUNCEDELIVERED, "yes" }, /* ** .pp - ** When this variable is \fIset\fP, Madmutt will include + ** When this variable is \fIset\fP, Madmutt will include ** \fTDelivered-To:\fP header fields when bouncing messages. ** Postfix users may wish to \fIunset\fP this variable. */ @@ -358,8 +316,8 @@ struct option_t MuttVars[] = { ** .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 + ** 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 @@ -396,18 +354,6 @@ struct option_t MuttVars[] = { ** When \fIunset\fP, Madmutt will not collapse a thread if it contains any ** unread messages. */ - {"count_attachments", DT_BOOL, R_NONE, OPTCOUNTATTACH, "yes"}, - /* - ** .pp - ** This variable controls whether attachments should be counted for $$$index_format - ** and its \fT%X\fP expando or not. As for scoring, this variable can be used to - ** selectively turn counting on or off instead of removing and re-adding rules as - ** prefered because counting requires full loading of messages. - ** .pp - ** If it is \fIset\fP and rules were defined via the \fTattachments\fP and/or - ** \fTunattachments\fP commands, counting will be done. If it is \fIunset\fP no - ** counting will be done regardless whether rules were defined or not. - */ {"uncollapse_jump", DT_BOOL, R_NONE, OPTUNCOLLAPSEJUMP, "no" }, /* ** .pp @@ -422,13 +368,13 @@ struct option_t MuttVars[] = { ** set of \fTprintf(3)\fP-like sequences: ** .pp ** .dl - ** .dt %a .dd total number of attachments + ** .dt %a .dd total number of attachments ** .dt %h .dd local hostname ** .dt %l .dd approximate size (in bytes) of the current message ** .dt %v .dd Madmutt version string ** .de ** .pp - ** See the text describing the ``$$status_format'' option for more + ** 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, "" }, @@ -469,7 +415,6 @@ struct option_t MuttVars[] = { ** will be saved for later references. Also see ``$$record'', ** ``$$save_name'', ``$$force_name'' and ``$fcc-hook''. */ - {"crypt_use_gpgme", DT_BOOL, R_NONE, OPTCRYPTUSEGPGME, "no" }, /* ** .pp @@ -480,7 +425,6 @@ struct option_t MuttVars[] = { ** \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 @@ -566,44 +510,6 @@ struct option_t MuttVars[] = { ** is viewed it is passed as standard input to $$display_filter, and the ** filtered message is read from the standard output. */ -#if defined(USE_DOTLOCK) - {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$madmutt_bindir/muttng_dotlock"}, - /* - ** .pp - ** Availability: Dotlock - ** - ** .pp - ** Contains the path of the \fTmadmutt_dotlock(1)\fP binary to be used by - ** Madmutt. - */ -#endif - {"dsn_notify", DT_STR, R_NONE, UL &DsnNotify, ""}, - /* - ** .pp - ** \fBNote:\fP you should not enable this unless you are using Sendmail - ** 8.8.x or greater or in connection with the SMTP support via libESMTP. - ** .pp - ** This variable sets the request for when notification is returned. The - ** string consists of a comma separated list (no spaces!) of one or more - ** of the following: \fInever\fP, to never request notification, - ** \fIfailure\fP, to request notification on transmission failure, - ** \fIdelay\fP, to be notified of message delays, \fIsuccess\fP, to be - ** notified of successful transmission. - ** .pp - ** Example: \fTset dsn_notify="failure,delay"\fP - */ - {"dsn_return", DT_STR, R_NONE, UL &DsnReturn, ""}, - /* - ** .pp - ** \fBNote:\fP you should not enable this unless you are using Sendmail - ** 8.8.x or greater or in connection with the SMTP support via libESMTP. - ** .pp - ** This variable controls how much of your message is returned in DSN - ** messages. It may be set to either \fIhdrs\fP to return just the - ** message header, or \fIfull\fP to return the full message. - ** .pp - ** Example: \fTset dsn_return=hdrs\fP - */ {"duplicate_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTDUPTHREADS, "yes" }, /* ** .pp @@ -637,13 +543,6 @@ 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. */ - {"editor", DT_PATH, R_NONE, UL &Editor, "" }, - /* - ** .pp - ** This variable specifies which editor is used by Madmutt. - ** It defaults to the value of the \fT$$$VISUAL\fP, or \fT$$$EDITOR\fP, environment - ** variable, or to the string "\fTvi\fP" if neither of those are set. - */ {"encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, "no" }, /* ** .pp @@ -836,27 +735,12 @@ struct option_t MuttVars[] = { ** ``$$reverse_name''. This variable is ignored if ``$$use_from'' ** is unset. ** .pp - ** E.g. you can use + ** E.g. you can use ** \fTsend-hook Madmutt-devel@lists.berlios.de 'my_hdr From: Foo Bar '\fP ** when replying to the Madmutt developer's mailing list and Madmutt takes this email address. ** .pp ** Defaults to the contents of the environment variable \fT$$$EMAIL\fP. */ - {"gecos_mask", DT_RX, R_NONE, UL &GecosMask, "^[^,]*"}, - /* - ** .pp - ** A regular expression used by Madmutt to parse the GECOS field of a password - ** entry when expanding the alias. By default the regular expression is set - ** to ``\fT^[^,]*\fP'' which will return the string up to the first ``\fT,\fP'' encountered. - ** If the GECOS field contains a string like "lastname, firstname" then you - ** should do: \fTset gecos_mask=".*"\fP. - ** .pp - ** This can be useful if you see the following behavior: you address a e-mail - ** to user ID stevef whose full name is Steve Franklin. If Madmutt expands - ** stevef to ``Franklin'' stevef@foo.bar then you should set the gecos_mask to - ** a regular expression that will match the whole name so Madmutt will expand - ** ``Franklin'' to ``Franklin, Steve''. - */ #ifdef USE_NNTP {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, "%4C %M%N %5s %-45.45f %d"}, /* @@ -913,7 +797,7 @@ struct option_t MuttVars[] = { ** .pp ** When \fIset\fP, Madmutt will skip the host name part of ``$$hostname'' variable ** when adding the domain part to addresses. This variable does not - ** affect the generation of \fTMessage-ID:\fP header fields, and it will not lead to the + ** 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" }, @@ -1302,7 +1186,6 @@ struct option_t MuttVars[] = { ** DOING!\fP */ #ifdef USE_HCACHE - {"header_cache", DT_PATH, R_NONE, UL &HeaderCache, "" }, /* ** .pp @@ -1342,7 +1225,7 @@ struct option_t MuttVars[] = { ** cache (first hit). */ #endif /* HAVE_GDBM || HAVE_DB 4 */ -#if HAVE_QDBM +#ifdef HAVE_QDBM { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, "no" }, /* ** .pp @@ -1394,85 +1277,6 @@ struct option_t MuttVars[] = { ** This specifies the folder into which read mail in your ``$$spoolfile'' ** folder will be appended. */ - {"madmutt_version", DT_SYS, R_NONE, 0, VERSION }, - /* - ** .pp - ** \fIThis is a read-only system property and specifies madmutt's - ** version string.\fP - */ - {"madmutt_revision", DT_SYS, R_NONE, 0, MUTT_REVISION }, - /* - ** .pp - ** \fIThis is a read-only system property and specifies madmutt's - ** subversion revision string.\fP - */ - {"madmutt_sysconfdir", DT_SYS, R_NONE, 0, SYSCONFDIR }, - /* - ** .pp - ** \fIThis is a read-only system property and specifies the - ** directory containing the madmutt system-wide configuration.\fP - */ - {"madmutt_bindir", DT_SYS, R_NONE, 0, BINDIR }, - /* - ** .pp - ** \fIThis is a read-only system property and specifies the - ** directory containing the madmutt binary.\fP - */ - {"madmutt_docdir", DT_SYS, R_NONE, 0, PKGDOCDIR }, - /* - ** .pp - ** \fIThis is a read-only system property and specifies the - ** directory containing the madmutt documentation.\fP - */ -#ifdef USE_HCACHE -#if HAVE_QDBM - {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "qdbm" }, -#elif HAVE_GDBM - {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "gdbm" }, -#elif HAVE_DB4 - {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "db4" }, -#else - {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "unknown" }, -#endif - /* - ** .pp - ** \fIThis is a read-only system property and specifies the - ** header chaching's database backend.\fP - */ -#endif - {"madmutt_folder_path", DT_SYS, R_NONE, 0, "" }, - /* - ** .pp - ** \fIThis is a read-only system property and, at runtime, - ** specifies the full path or URI of the folder currently - ** open (if any).\fP - */ - {"madmutt_folder_name", DT_SYS, R_NONE, 0, "" }, - /* - ** .pp - ** \fIThis is a read-only system property and, at runtime, - ** specifies the actual name of the folder as far as it could - ** be detected.\fP - ** .pp - ** For detection, $$$folder is first taken into account - ** and simply stripped to form the result when a match is found. For - ** example, with $$$folder being \fTimap://host\fP and the folder is - ** \fTimap://host/INBOX/foo\fP, $$$madmutt_folder_name will be just - ** \fTINBOX/foo\fP.) - ** .pp - ** Second, if the initial portion of a name is not $$$folder, - ** the result will be everything after the last ``/''. - ** .pp - ** Third and last, the result will be just the name if neither - ** $$$folder nor a ``/'' were found in the name. - */ - {"madmutt_pwd", DT_SYS, R_NONE, 0, "" }, - /* - ** .pp - ** \fIThis is a read-only system property and, at runtime, - ** specifies the current working directory of the madmutt - ** binary.\fP - */ {"operating_system", DT_STR, R_NONE, UL &OperatingSystem, "" }, /* ** .pp @@ -1492,7 +1296,7 @@ struct option_t MuttVars[] = { {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, "|"}, /* ** .pp - ** This specifies the delimiter between the sidebar (if visible) and + ** This specifies the delimiter between the sidebar (if visible) and ** other screens. */ {"sidebar_visible", DT_BOOL, R_BOTH, OPTMBOXPANE, "no" }, @@ -1540,9 +1344,9 @@ struct option_t MuttVars[] = { ** .pp ** When \fIset\fP, the ``hierarchy'' of the sidebar entries will be shortened ** only if they cannot be printed in full length (because ``$$sidebar_width'' - ** is set to a too low value). For example, if the newsgroup name + ** is set to a too low value). For example, if the newsgroup name ** ``de.alt.sysadmin.recovery'' doesn't fit on the screen, it'll get shortened - ** ``d.a.s.recovery'' while ``de.alt.d0'' still would and thus will not get + ** ``d.a.s.recovery'' while ``de.alt.d0'' still would and thus will not get ** shortened. ** .pp ** At which characters this compression is done is controled via the @@ -1643,7 +1447,6 @@ struct option_t MuttVars[] = { ** 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" }, /* @@ -1657,16 +1460,11 @@ struct option_t MuttVars[] = { ** \fBNote:\fP Only change this setting if you know what you are doing. */ #endif - -#ifdef MIXMASTER {"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, "%4n %c %-16s %a"}, /* - ** .pp - ** Availability: Mixmaster - ** ** .pp ** This variable describes the format of a remailer line on the mixmaster - ** chain selection screen. The following \fTprintf(3)\fP-like sequences are + ** chain selection screen. The following \fTprintf(3)\fP-like sequences are ** supported: ** .pp ** .dl @@ -1678,16 +1476,12 @@ struct option_t MuttVars[] = { */ {"mixmaster", DT_PATH, R_NONE, UL &Mixmaster, MIXMASTER}, /* - ** .pp - ** Availability: 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. */ -#endif {"move", DT_QUAD, R_NONE, OPT_MOVE, "ask-no" }, /* ** .pp @@ -1718,7 +1512,7 @@ struct option_t MuttVars[] = { ** .dt %M .dd the current minute ** .dt %O .dd the current UNIX timestamp (octal) ** .dt %p .dd the process ID - ** .dt %P .dd the current Message-ID prefix (a character rotating with + ** .dt %P .dd the current Message-ID prefix (a character rotating with ** every Message-ID being generated) ** .dt %r .dd a random integer value (decimal) ** .dt %R .dd a random integer value (hexadecimal) @@ -1989,7 +1783,7 @@ struct option_t MuttVars[] = { /* ** .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 ``\fIask\fP'', ask whether or not to verify the signature. ** If ``\fIno\fP'', never attempt to verify cryptographic signatures. ** (Crypto only) */ @@ -1999,7 +1793,7 @@ struct option_t MuttVars[] = { ** 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 + ** 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 @@ -2115,7 +1909,7 @@ struct option_t MuttVars[] = { ** 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" }, /* @@ -2187,13 +1981,11 @@ struct option_t MuttVars[] = { ** 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 + ** 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: @@ -2244,7 +2036,7 @@ struct option_t MuttVars[] = { {"pgp_sign_command", DT_STR, R_NONE, UL &PgpSignCommand, "" }, /* ** .pp - ** This command is used to create the detached PGP signature for a + ** This command is used to create the detached PGP signature for a ** multipart/signed PGP/MIME body part. ** (PGP only) */ @@ -2263,7 +2055,7 @@ struct option_t MuttVars[] = { {"pgp_import_command", DT_STR, R_NONE, UL &PgpImportCommand, "" }, /* ** .pp - ** This command is used to import a key from a message into + ** This command is used to import a key from a message into ** the user's public key ring. ** (PGP only) */ @@ -2285,10 +2077,10 @@ struct option_t MuttVars[] = { /* ** .pp ** This command is used to list the secret key ring's contents. The - ** output format must be analogous to the one used by + ** 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 + ** This format is also generated by the \fTpgpring\fP utility which comes ** with Madmutt. ** (PGP only) */ @@ -2296,10 +2088,10 @@ struct option_t MuttVars[] = { /* ** .pp ** This command is used to list the public key ring's contents. The - ** output format must be analogous to the one used by + ** 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 + ** This format is also generated by the \fTpgpring\fP utility which comes ** with Madmutt. ** (PGP only) */ @@ -2376,7 +2168,7 @@ struct option_t MuttVars[] = { ** .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 + ** . points to a directory or file, this expands to ** . "-CApath $$smime_ca_location" or "-CAfile $$smime_ca_location". ** .de ** .pp @@ -2485,10 +2277,9 @@ struct option_t MuttVars[] = { ** .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. + ** regardless of the file's permissions. */ {"smtp_envelope", DT_SYN, R_NONE, UL "envelope_from_address", 0 }, - {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, "" }, /* ** .pp @@ -2565,12 +2356,12 @@ struct option_t MuttVars[] = { ** .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 + ** 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 + ** certificate that is signed with one of these CA certificates are ** also automatically accepted. ** .pp ** Example: \fTset certificate_file=~/.madmutt/certificates\fP @@ -2583,7 +2374,7 @@ struct option_t MuttVars[] = { ** ** .pp ** If set to \fIyes\fP, Madmutt will use CA certificates in the - ** system-wide certificate store when checking if server certificate + ** system-wide certificate store when checking if server certificate ** is signed by a trusted CA. */ {"entropy_file", DT_PATH, R_NONE, UL &SslEntropyFile, "" }, @@ -2649,7 +2440,7 @@ struct option_t MuttVars[] = { /* ** .pp ** Used in connection with the \fIpipe-message\fP command and the ``tag- - ** prefix'' or ``tag-prefix-cond'' operators. + ** prefix'' or ``tag-prefix-cond'' operators. ** If this variable is \fIunset\fP, when piping a list of ** tagged messages Madmutt will concatenate the messages and will pipe them ** as a single folder. When \fIset\fP, Madmutt will pipe the messages one by one. @@ -2828,7 +2619,7 @@ struct option_t MuttVars[] = { ** .pp ** Used in connection with the print-message command. If this option ** is \fIset\fP, the command specified by $$print_command is executed once for - ** each message which is to be printed. If this option is \fIunset\fP, + ** each message which is to be printed. If this option is \fIunset\fP, ** the command specified by $$print_command is executed only once, and ** all the messages are concatenated, with a form feed as the message ** separator. @@ -2852,14 +2643,6 @@ struct option_t MuttVars[] = { ** with the query string the user types. See ``$query'' for more ** information. */ - {"quit", DT_QUAD, R_NONE, OPT_QUIT, "yes" }, - /* - ** .pp - ** This variable controls whether ``quit'' and ``exit'' actually quit - ** from Madmutt. If it set to \fIyes\fP, they do quit, if it is set to \fIno\fP, they - ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are - ** prompted for confirmation when you try to quit. - */ {"quote_empty", DT_BOOL, R_NONE, OPTQUOTEEMPTY, "yes" }, /* ** .pp @@ -2955,7 +2738,7 @@ struct option_t MuttVars[] = { ** If \fIset\fP, when replying to a message, Madmutt will use the address listed ** in the ``\fTReply-To:\fP'' header field as the recipient of the reply. If \fIunset\fP, ** it will use the address in the ``\fTFrom:\fP'' header field instead. - ** .pp + ** .pp ** This ** option is useful for reading a mailing list that sets the ``\fTReply-To:\fP'' ** header field to the list address and you want to send a private @@ -3006,26 +2789,6 @@ 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. */ - {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, "no" }, - /* - ** .pp - ** When this variable is \fIset\fP, Madmutt will decode RFC-2047-encoded MIME - ** parameters. You want to set this variable when Madmutt suggests you - ** to save attachments to files named like this: - ** .pp - ** \fT=?iso-8859-1?Q?file=5F=E4=5F991116=2Ezip?=\fP - ** .pp - ** When this variable is \fIset\fP interactively, the change doesn't have - ** the desired effect before you have changed folders. - ** .pp - ** Note that this use of RFC 2047's encoding is explicitly, - ** prohibited by the standard, but nevertheless encountered in the - ** wild. - ** .pp - ** Also note that setting this parameter will \fInot\fP have the effect - ** that Madmutt \fIgenerates\fP this kind of encoding. Instead, Madmutt will - ** unconditionally use the encoding specified in RFC 2231. - */ {"save_address", DT_BOOL, R_NONE, OPTSAVEADDRESS, "no" }, /* ** .pp @@ -3073,9 +2836,9 @@ struct option_t MuttVars[] = { ** 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 + ** 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" }, @@ -3097,13 +2860,6 @@ struct option_t MuttVars[] = { ** \fTiso-8859-2\fP, \fTkoi8-r\fP or \fTiso-2022-jp\fP) either ** instead of or after \fTiso-8859-1\fP. */ - {"sendmail", DT_PATH, R_NONE, UL &Sendmail, SENDMAIL " -oem -oi"}, - /* - ** .pp - ** Specifies the program and arguments used to deliver mail sent by Madmutt. - ** Madmutt expects that the specified program interprets additional - ** arguments as recipient addresses. - */ {"sendmail_wait", DT_NUM, R_NONE, UL &SendmailWait, "0" }, /* ** .pp @@ -3121,12 +2877,6 @@ struct option_t MuttVars[] = { ** process will be put in a temporary file. If there is some error, you ** will be informed as to where to find the output. */ - {"shell", DT_PATH, R_NONE, UL &Shell, "" }, - /* - ** .pp - ** Command to use when spawning a subshell. By default, the user's login - ** shell from \fT/etc/passwd\fP is used. - */ #ifdef USE_NNTP {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, "no" }, /* @@ -3194,7 +2944,7 @@ struct option_t MuttVars[] = { ** If \fIset\fP, this string will be inserted before the signature. This is useful ** for people that want to sign off every message they send with their name. ** .pp - ** If you want to insert your website's URL, additional contact information or + ** If you want to insert your website's URL, additional contact information or ** witty quotes into your mails, better use a signature file instead of ** the signoff string. */ @@ -3231,7 +2981,7 @@ struct option_t MuttVars[] = { ** .pp ** Specifies time, in seconds, to pause while displaying certain informational ** messages, while moving from folder to folder and after expunging - ** messages from the current folder. The default is to pause one second, so + ** 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" }, @@ -3362,7 +3112,7 @@ struct option_t MuttVars[] = { ** .dt %F .dd number of flagged messages * ** .dt %h .dd local hostname ** .dt %l .dd size (in bytes) of the current mailbox * - ** .dt %L .dd size (in bytes) of the messages shown + ** .dt %L .dd size (in bytes) of the messages shown ** (i.e., which match the current limit) * ** .dt %m .dd the number of messages in the mailbox * ** .dt %M .dd the number of messages shown (i.e., which match the current limit) * @@ -3417,7 +3167,7 @@ struct option_t MuttVars[] = { ** \fT%_h\fP ** .pp ** If you prefix the sequence character with a colon (\fT:\fP) character, Madmutt - ** will replace any dots in the expansion by underscores. This might be helpful + ** 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" }, @@ -3440,19 +3190,6 @@ 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_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "yes" }, - /* - ** .pp - ** When \fIunset\fP, non MIME-compliant messages that doesn't have any - ** charset indication in the ``\fTContent-Type:\fP'' header field can - ** be displayed (non MIME-compliant messages are often generated by old - ** mailers or buggy mailers like MS Outlook Express). - ** See also $$assumed_charset. - ** .pp - ** This option also replaces linear-white-space between encoded-word - ** and *text to a single space to prevent the display of MIME-encoded - ** ``\fTSubject:\fP'' header field from being devided into multiple lines. - */ {"strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, "no" }, /* ** .pp @@ -3498,7 +3235,7 @@ struct option_t MuttVars[] = { ** .pp ** When \fIset\fP, Madmutt will generate \fTtext/plain; format=flowed\fP attachments. ** This format is easier to handle for some mailing software, and generally - ** just looks like ordinary text. To actually make use of this format's + ** just looks like ordinary text. To actually make use of this format's ** features, you'll need support in your editor. ** .pp ** Note that $$indent_string is ignored when this option is set. @@ -3531,14 +3268,6 @@ struct option_t MuttVars[] = { ** checking for new mail. A value of zero or less will cause Madmutt ** to never time out. */ - {"tmpdir", DT_PATH, R_NONE, UL &Tempdir, "" }, - /* - ** .pp - ** This variable allows you to specify where Madmutt will place its - ** temporary files needed for displaying and composing messages. If - ** this variable is not set, the environment variable \fT$$$TMPDIR\fP is - ** used. If \fT$$$TMPDIR\fP is not set then "\fT/tmp\fP" is used. - */ {"to_chars", DT_STR, R_BOTH, UL &Tochars, " +TCFL"}, /* ** .pp @@ -3730,123 +3459,72 @@ struct option_t MuttVars[] = { ** ** .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 + ** (that contains full name of the original article author) to articles that ** you followup to. */ #endif /*--*/ + {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "no" }, + {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, "yes"}, { NULL, -1, R_NONE, -1, NULL } }; -static const char* Features[] = { -#ifdef NCURSES_VERSION - "ncurses", -#endif -#ifdef USE_SLANG_CURSES - "slang", -#endif -#ifdef _LIBICONV_VERSION - "iconv", -#endif -#ifdef HAVE_LIBIDN - "idn", -#endif -#ifdef USE_DOTLOCK - "dotlock", -#endif -#ifdef USE_NNTP - "nntp", -#endif -#ifdef USE_SSL - "ssl", -#endif -#ifdef USE_GNUTLS - "gnutls", -#endif -#ifdef USE_SASL - "sasl", -#endif -#ifdef USE_LIBESMTP - "libesmtp", -#endif -#ifdef HAVE_COLOR - "color", -#endif -#ifdef CRYPT_BACKEND_GPGME - "gpgme", -#endif -#ifdef USE_HCACHE - "header_cache", -#endif -#ifdef HAVE_QDBM - "qdbm", -#endif -#ifdef HAVE_GDBM - "gdbm", -#endif -#ifdef HAVE_DB4 - "db4", -#endif - /* last */ - NULL -}; - const struct mapping_t SortMethods[] = { - {"date", SORT_DATE}, - {"date-sent", SORT_DATE}, - {"date-received", SORT_RECEIVED}, - {"mailbox-order", SORT_ORDER}, - {"subject", SORT_SUBJECT}, - {"from", SORT_FROM}, - {"size", SORT_SIZE}, - {"threads", SORT_THREADS}, - {"to", SORT_TO}, - {"score", SORT_SCORE}, - {"spam", SORT_SPAM}, - {NULL, 0} + {"date", SORT_DATE}, + {"date-sent", SORT_DATE}, + {"date-received", SORT_RECEIVED}, + {"mailbox-order", SORT_ORDER}, + {"subject", SORT_SUBJECT}, + {"from", SORT_FROM}, + {"size", SORT_SIZE}, + {"threads", SORT_THREADS}, + {"to", SORT_TO}, + {"score", SORT_SCORE}, + {"spam", SORT_SPAM}, + {NULL, 0} }; /* same as SortMethods, but with "threads" replaced by "date" */ const struct mapping_t SortAuxMethods[] = { - {"date", SORT_DATE}, - {"date-sent", SORT_DATE}, - {"date-received", SORT_RECEIVED}, - {"mailbox-order", SORT_ORDER}, - {"subject", SORT_SUBJECT}, - {"from", SORT_FROM}, - {"size", SORT_SIZE}, - {"threads", SORT_DATE}, /* note: sort_aux == threads - * isn't possible. - */ - {"to", SORT_TO}, - {"score", SORT_SCORE}, - {"spam", SORT_SPAM}, - {NULL, 0} + {"date", SORT_DATE}, + {"date-sent", SORT_DATE}, + {"date-received", SORT_RECEIVED}, + {"mailbox-order", SORT_ORDER}, + {"subject", SORT_SUBJECT}, + {"from", SORT_FROM}, + {"size", SORT_SIZE}, + {"threads", SORT_DATE}, /* note: sort_aux == threads + * isn't possible. + */ + {"to", SORT_TO}, + {"score", SORT_SCORE}, + {"spam", SORT_SPAM}, + {NULL, 0} }; const struct mapping_t SortBrowserMethods[] = { - {"alpha", SORT_SUBJECT}, - {"date", SORT_DATE}, - {"size", SORT_SIZE}, - {"unsorted", SORT_ORDER}, - {NULL, 0} + {"alpha", SORT_SUBJECT}, + {"date", SORT_DATE}, + {"size", SORT_SIZE}, + {"unsorted", SORT_ORDER}, + {NULL, 0} }; const struct mapping_t SortAliasMethods[] = { - {"alias", SORT_ALIAS}, - {"address", SORT_ADDRESS}, - {"unsorted", SORT_ORDER}, - {NULL, 0} + {"alias", SORT_ALIAS}, + {"address", SORT_ADDRESS}, + {"unsorted", SORT_ORDER}, + {NULL, 0} }; const struct mapping_t SortKeyMethods[] = { - {"address", SORT_ADDRESS}, - {"date", SORT_DATE}, - {"keyid", SORT_KEYID}, - {"trust", SORT_TRUST}, - {NULL, 0} + {"address", SORT_ADDRESS}, + {"date", SORT_DATE}, + {"keyid", SORT_KEYID}, + {"trust", SORT_TRUST}, + {NULL, 0} }; @@ -3861,7 +3539,6 @@ static int parse_lists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_ifdef (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 *); @@ -3875,76 +3552,72 @@ static int parse_alternates (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalternates (BUFFER *, BUFFER *, unsigned long, BUFFER *); struct command_t { - const char *name; - int (*func) (BUFFER *, BUFFER *, unsigned long, BUFFER *); - unsigned long data; + const char *name; + int (*func) (BUFFER *, BUFFER *, unsigned long, BUFFER *); + unsigned long data; }; struct command_t Commands[] = { - {"alternates", parse_alternates, 0}, - {"attachments", parse_attachments, 0 }, - {"unattachments",parse_unattachments,0 }, - {"unalternates", parse_unalternates, 0}, - {"account-hook", mutt_parse_hook, M_ACCOUNTHOOK}, - {"alias", parse_alias, 0}, - {"auto_view", parse_list, UL &AutoViewList}, - {"alternative_order", parse_list, UL &AlternativeOrderList}, - {"bind", mutt_parse_bind, 0}, - {"charset-hook", mutt_parse_hook, M_CHARSETHOOK}, -#ifdef HAVE_COLOR - {"color", mutt_parse_color, 0}, - {"uncolor", mutt_parse_uncolor, 0}, -#endif - {"exec", mutt_parse_exec, 0}, - {"fcc-hook", mutt_parse_hook, M_FCCHOOK}, - {"fcc-save-hook", mutt_parse_hook, M_FCCHOOK|M_SAVEHOOK}, - {"folder-hook", mutt_parse_hook, M_FOLDERHOOK}, - {"open-hook", mutt_parse_hook, M_OPENHOOK}, - {"close-hook", mutt_parse_hook, M_CLOSEHOOK}, - {"append-hook", mutt_parse_hook, M_APPENDHOOK}, - {"hdr_order", parse_list, UL &HeaderOrderList}, - {"ifdef", parse_ifdef, 1}, - {"ifndef", parse_ifdef, 0}, + {"mailboxes", buffy_parse_mailboxes, M_MAILBOXES}, + {"unmailboxes", buffy_parse_mailboxes, M_UNMAILBOXES}, + {"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}, + {"charset-hook", mutt_parse_hook, M_CHARSETHOOK}, + {"close-hook", mutt_parse_hook, M_CLOSEHOOK}, + {"crypt-hook", mutt_parse_hook, M_CRYPTHOOK}, + {"fcc-hook", mutt_parse_hook, M_FCCHOOK}, + {"fcc-save-hook", mutt_parse_hook, M_FCCHOOK|M_SAVEHOOK}, + {"folder-hook", mutt_parse_hook, M_FOLDERHOOK}, #ifdef HAVE_ICONV - {"iconv-hook", mutt_parse_hook, M_ICONVHOOK}, + {"iconv-hook", mutt_parse_hook, M_ICONVHOOK}, #endif - {"ignore", parse_ignore, 0}, - {"lists", parse_lists, 0}, - {"macro", mutt_parse_macro, 0}, - {"mailboxes", buffy_parse_mailboxes, M_MAILBOXES}, - {"unmailboxes", buffy_parse_mailboxes, M_UNMAILBOXES}, - {"message-hook", mutt_parse_hook, M_MESSAGEHOOK}, - {"mbox-hook", mutt_parse_hook, M_MBOXHOOK}, - {"mime_lookup", parse_list, UL &MimeLookupList}, - {"unmime_lookup", parse_unlist, UL &MimeLookupList}, - {"mono", mutt_parse_mono, 0}, - {"my_hdr", parse_my_hdr, 0}, - {"pgp-hook", mutt_parse_hook, M_CRYPTHOOK}, - {"crypt-hook", mutt_parse_hook, M_CRYPTHOOK}, - {"push", mutt_parse_push, 0}, - {"reply-hook", mutt_parse_hook, M_REPLYHOOK}, - {"reset", parse_set, M_SET_RESET}, - {"save-hook", mutt_parse_hook, M_SAVEHOOK}, - {"score", mutt_parse_score, 0}, - {"send-hook", mutt_parse_hook, M_SENDHOOK}, - {"send2-hook", mutt_parse_hook, M_SEND2HOOK}, - {"set", parse_set, 0}, - {"source", parse_source, 0}, - {"spam", parse_spam_list, M_SPAM}, - {"nospam", parse_spam_list, M_NOSPAM}, - {"subscribe", parse_subscribe, 0}, - {"toggle", parse_set, M_SET_INV}, - {"unalias", parse_unalias, 0}, - {"unalternative_order", parse_unlist, UL &AlternativeOrderList}, - {"unauto_view", parse_unlist, UL &AutoViewList}, - {"unhdr_order", parse_unlist, UL &HeaderOrderList}, - {"unhook", mutt_parse_unhook, 0}, - {"unignore", parse_unignore, 0}, - {"unlists", parse_unlists, 0}, - {"unmono", mutt_parse_unmono, 0}, - {"unmy_hdr", parse_unmy_hdr, 0}, - {"unscore", mutt_parse_unscore, 0}, - {"unset", parse_set, M_SET_UNSET}, - {"unsubscribe", parse_unsubscribe, 0}, - {NULL, NULL, 0} + {"mbox-hook", mutt_parse_hook, M_MBOXHOOK}, + {"message-hook", mutt_parse_hook, M_MESSAGEHOOK}, + {"open-hook", mutt_parse_hook, M_OPENHOOK}, + {"pgp-hook", mutt_parse_hook, M_CRYPTHOOK}, + {"reply-hook", mutt_parse_hook, M_REPLYHOOK}, + {"save-hook", mutt_parse_hook, M_SAVEHOOK}, + {"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}, + {"alternates", parse_alternates, 0}, + {"attachments", parse_attachments, 0 }, + {"ignore", parse_ignore, 0}, + {"alternative_order", parse_list, UL &AlternativeOrderList}, + {"auto_view", parse_list, UL &AutoViewList}, + {"hdr_order", parse_list, UL &HeaderOrderList}, + {"mime_lookup", parse_list, UL &MimeLookupList}, + {"lists", parse_lists, 0}, + {"my_hdr", parse_my_hdr, 0}, + {"reset", parse_set, M_SET_RESET}, + {"set", parse_set, 0}, + {"toggle", parse_set, M_SET_INV}, + {"unset", parse_set, M_SET_UNSET}, + {"source", parse_source, 0}, + {"nospam", parse_spam_list, M_NOSPAM}, + {"spam", parse_spam_list, M_SPAM}, + {"subscribe", parse_subscribe, 0}, + {"unalias", parse_unalias, 0}, + {"unalternates", parse_unalternates, 0}, + {"unattachments", parse_unattachments, 0}, + {"unignore", parse_unignore, 0}, + {"unlists", parse_unlists, 0}, + {"unalternative_order", parse_unlist, UL &AlternativeOrderList}, + {"unauto_view", parse_unlist, UL &AutoViewList}, + {"unhdr_order", parse_unlist, UL &HeaderOrderList}, + {"unmime_lookup", parse_unlist, UL &MimeLookupList}, + {"unmy_hdr", parse_unmy_hdr, 0}, + {"unsubscribe", parse_unsubscribe, 0}, + {NULL, NULL, 0} };