Change the default for sidebar_format to use %n.

The next series of patches is going to create a new option,
$mail_check_stats defaulting off.  When off, the extended buffy which
calculates total/new/flagged messages won't be run.  To help reduce
"sidebar is broken" bug reports, this changes the default format to
something not requiring extended buffy.

The previous default is documented in the option and preserved in the
sample sidebar muttrc in contrib.

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index 912ebe25fa8b15dae45b385a032bb710b519b629..f30a947b2303963e772ffdd5b00e085457f7f2ec 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -8147,7 +8147,7 @@ please have a look at the mixmaster documentation.
          <row>
            <entry><literal>sidebar_format</literal></entry>
            <entry>string</entry>
-           <entry><literal>%B%?F? [%F]?%* %?N?%N/?%S</literal></entry>
+           <entry><literal>%B%*  %n</literal></entry>
          </row>
          <row>
            <entry><literal>sidebar_indent_string</literal></entry>

diff --git a/init.h b/init.h
index cf1c4cd8d04956147757e42f17be2427ba158b64..4b1617af78a0bd7a22de5a90b00b96dbea9458c2 100644 (file)
--- a/init.h
+++ b/init.h
@@ -2700,7 +2700,7 @@ struct option_t MuttVars[] = {
   ** .pp
   ** \fBSee also:\fP $$sidebar_short_path, $$sidebar_indent_string, $$sidebar_delim_chars.
   */
-  { "sidebar_format", DT_STR, R_NONE, UL &SidebarFormat, UL "%B%?F? [%F]?%* %?N?%N/?%S" },
+  { "sidebar_format", DT_STR, R_NONE, UL &SidebarFormat, UL "%B%*  %n" },
   /*
   ** .pp
   ** This variable allows you to customize the sidebar display. This string is
@@ -2726,6 +2726,8 @@ struct option_t MuttVars[] = {
   ** .pp
   ** * = Can be optionally printed if nonzero
   ** @ = Only applicable to the current folder
+  ** .pp
+  ** A useful value for this is "%B%?F? [%F]?%* %?N?%N/?%S".
   */
   { "sidebar_indent_string", DT_STR, R_BOTH, UL &SidebarIndentString, UL "  " },
   /*