X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=init.h;h=494616b1517a3ce1f71d136006d51a15c9121628;hb=5ccacda9b868a0db6bb78ce6e3503861f6b93b67;hp=a2b76871f646497ae466acfe9b60e72a14f05712;hpb=fd64f718a3d2c9ea13aac19f48b6b03bcf502118;p=apps%2Fmadmutt.git

diff --git a/init.h b/init.h
index a2b7687..494616b 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},
   /*
@@ -1338,6 +1340,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 +1369,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 +1565,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 +3012,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},
   /*
@@ -3806,8 +3837,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},