X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=a12d82d2292eb72966884b3de1db16dd28174652;hp=a2b76871f646497ae466acfe9b60e72a14f05712;hb=105e395f06e15f2c3878d856bc278dd2cf971794;hpb=fd64f718a3d2c9ea13aac19f48b6b03bcf502118 diff --git a/init.h b/init.h index a2b7687..a12d82d 100644 --- a/init.h +++ b/init.h @@ -885,8 +885,10 @@ struct option_t MuttVars[] = { /* ** .pp ** Specifies the hostname to use after the ``\fT@\fP'' in local e-mail - ** addresses. This overrides the compile time definition obtained from - ** \fT/etc/resolv.conf\fP. + ** addresses and during generation of \fTMessage-Id:\fP headers. + ** .pp + ** Please be sure to really know what you are doing when changing this variable + ** to configure a custom domain part of Message-IDs. */ {"ignore_list_reply_to", DT_BOOL, R_NONE, OPTIGNORELISTREPLYTO, 0}, /* @@ -1259,8 +1261,8 @@ struct option_t MuttVars[] = { ** .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 and so no - ** header caching will be done. + ** be a single global header cache. By default it is \fIunset\fP so no + ** header caching will be used. */ {"maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, 1}, /* @@ -1272,6 +1274,7 @@ struct option_t MuttVars[] = { ** files when the header cache is in use. This incurs one \fTstat(2)\fP per ** message every time the folder is opened. */ +#if HAVE_GDBM || HAVE_DB4 {"header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384"}, /* ** .pp @@ -1283,9 +1286,19 @@ struct option_t MuttVars[] = { ** 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 after Mutt-ng maildir header + ** less the best you can get. For details google for mutt header ** cache (first hit). */ +#endif /* HAVE_GDBM || HAVE_DB 4 */ +#if HAVE_QDBM + { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, 0 }, + /* + ** .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, 0}, /* @@ -1338,6 +1351,13 @@ struct option_t MuttVars[] = { ** .pp ** It may, for example, look as: ``\fTmutt-ng 1.5.9i (Linux)\fP''. */ + {"sidebar_boundary", DT_STR, R_BOTH, UL &SidebarBoundary, UL "." }, + /* + ** .pp + ** When the sidebar is displayed and $$sidebar_shorten_hierarchy is \fIset\fP, this + ** variable specifies the characters at which to split a folder name into + ** ``hierarchy items.'' + */ {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, UL "|"}, /* ** .pp @@ -1360,6 +1380,37 @@ struct option_t MuttVars[] = { ** .pp ** If \fIset\fP, only folders with new mail will be shown in the sidebar. */ + {"sidebar_number_format", DT_STR, R_BOTH, UL &SidebarNumberFormat, UL "%c%?n?(%n)?%?f?[%f]?"}, + /* + ** .pp + ** This variable controls how message counts are printed when the sidebar + ** is enabled. If this variable is \fIempty\fP (\fIand only if\fP), no numbers + ** will be printed \fIand\fP mutt-ng won't frequently count mail (which + ** may be a great speedup esp. with mbox-style mailboxes.) + ** .pp + ** The following \fTprintf(3)\fP-like sequences are supported: + ** .pp + ** .dl + ** .dt %c .dd Total number of messages. + ** .dt %f .dd Number of flagged messages. + ** .dt %n .dd Number of new messages. + ** .de + ** .pp + ** The \fT%f\fP and \fT%n\fP expandos may optionally be printed non-zero. + */ + {"sidebar_shorten_hierarchy", DT_BOOL, R_NONE, OPTSHORTENHIERARCHY, 0}, + /* + ** .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 + ** ``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 + ** shortened. + ** .pp + ** At which characters this compression is done is controled via the + ** $$sidebar_boundary variable. + */ {"mbox_type", DT_MAGIC, R_NONE, UL &DefaultMagic, M_MBOX}, /* ** .pp @@ -1525,8 +1576,8 @@ struct option_t MuttVars[] = { /* ** .pp ** This is the format for the ``local part'' of the \fTMessage-Id:\fP header - ** field generated - ** by Mutt-ng. The format string contains of one or more characters. The '%' + ** field generated by Mutt-ng. If this variable is empty, no \fTMessage-Id:\fP + ** headers will be generated. The '%' ** character marks that certain data will be added to the string, similar to ** \fTprintf(3)\fP. The following characters are allowed: ** .pp @@ -2972,16 +3023,7 @@ struct option_t MuttVars[] = { ** ``newsrc'' file and into the news cache. */ #endif - {"shorten_hierarchy", DT_BOOL, R_NONE, OPTSHORTENHIERARCHY, 0}, - /* - ** .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 - ** ``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 - ** shortened. - */ + {"shorten_hierarchy", DT_SYN, R_NONE, UL "sidebar_shorten_hierarchy", 0 }, #ifdef USE_NNTP {"show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, 1}, /* @@ -3566,120 +3608,137 @@ const struct feature_t Features[] = { #endif }, {"slang", #ifdef USE_SLANG_CURSES - 1 + 1 #else - 0 + 0 #endif - }, {"iconv", + }, {"iconv", #ifdef _LIBICONV_VERSION - 1 + 1 #else - 0 + 0 #endif - }, {"idn", + }, {"idn", #ifdef HAVE_LIBIDN - 1 + 1 #else - 0 + 0 #endif - }, {"dotlock", + }, {"dotlock", #ifdef USE_DOTLOCK - 1 + 1 #else - 0 + 0 #endif - }, {"standalone", + }, {"standalone", #ifdef DL_STANDALONE - 1 + 1 #else - 0 + 0 #endif - }, {"pop", + }, {"pop", #ifdef USE_POP - 1 + 1 #else - 0 + 0 #endif - }, {"nntp", + }, {"nntp", #ifdef USE_NNTP - 1 + 1 #else - 0 + 0 #endif - }, {"imap", + }, {"imap", #ifdef USE_IMAP - 1 + 1 #else - 0 + 0 #endif - }, {"ssl", + }, {"ssl", #ifdef USE_SSL - 1 + 1 #else - 0 + 0 #endif - }, {"gnutls", + }, {"gnutls", #ifdef USE_GNUTLS - 1 + 1 #else - 0 + 0 #endif - }, {"sasl", + }, {"sasl", #ifdef USE_SASL - 1 + 1 #else - 0 + 0 #endif - }, {"sasl2", + }, {"sasl2", #ifdef USE_SASL2 - 1 + 1 #else - 0 + 0 #endif - }, {"libesmtp", + }, {"libesmtp", #ifdef USE_LIBESMTP - 1 + 1 #else - 0 + 0 #endif - }, {"compressed", + }, {"compressed", #ifdef USE_COMPRESSED - 1 + 1 #else - 0 + 0 #endif - }, {"color", + }, {"color", #ifdef HAVE_COLOR - 1 + 1 #else - 0 + 0 #endif - }, - {"classic_pgp", + }, {"classic_pgp", #ifdef CRYPT_BACKEND_CLASSIC_PGP - 1 + 1 #else - 0 + 0 #endif - }, {"classic_smime", + }, {"classic_smime", #ifdef CRYPT_BACKEND_CLASSIC_SMIME - 1 + 1 #else - 0 + 0 #endif - }, {"gpgme", + }, {"gpgme", #ifdef CRYPT_BACKEND_GPGME - 1 + 1 #else - 0 + 0 #endif - }, {"header_cache", + }, {"header_cache", #ifdef USE_HCACHE - 1 + 1 +#else + 0 +#endif + }, {"qdbm", +#ifdef HAVE_QDBM + 1 +#else + 0 +#endif + }, {"gdbm", +#ifdef HAVE_GDBM + 1 #else - 0 + 0 +#endif + }, {"db4", +#ifdef HAVE_DB4 + 1 +#else + 0 #endif - }, + }, /* last */ {NULL, 0} }; @@ -3806,8 +3865,8 @@ struct command_t Commands[] = { {"ignore", parse_ignore, 0}, {"lists", parse_lists, 0}, {"macro", mutt_parse_macro, 0}, - {"mailboxes", mutt_parse_mailboxes, M_MAILBOXES}, - {"unmailboxes", mutt_parse_mailboxes, M_UNMAILBOXES}, + {"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},