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 56c17904c00abb59238f8193a19d2518886b20bc..6b726a18d5e4cfcaeea0f41d2fd16433ad4d2f95 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -8773,80 +8773,80 @@ please have a look at the mixmaster documentation.
     <table id="table-sidebar-variables">
       <title>Sidebar Variables</title>
       <tgroup cols="3">
-        <thead>
-          <row>
-            <entry>Name</entry>
-            <entry>Type</entry>
-            <entry>Default</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry><literal>sidebar_delim_chars</literal></entry>
-            <entry>string</entry>
-            <entry><literal>/.</literal></entry>
-          </row>
-          <row>
-            <entry><literal>sidebar_divider_char</literal></entry>
-            <entry>string</entry>
-            <entry><literal>|</literal></entry>
-          </row>
-          <row>
-            <entry><literal>sidebar_folder_indent</literal></entry>
-            <entry>boolean</entry>
-            <entry><literal>no</literal></entry>
-          </row>
-          <row>
-            <entry><literal>sidebar_format</literal></entry>
-            <entry>string</entry>
-            <entry><literal>%B%?F? [%F]?%* %?N?%N/?%S</literal></entry>
-          </row>
-          <row>
-            <entry><literal>sidebar_indent_string</literal></entry>
-            <entry>string</entry>
-            <entry><literal>&nbsp;&nbsp;</literal> (two spaces)</entry>
-          </row>
-          <row>
-            <entry><literal>sidebar_new_mail_only</literal></entry>
-            <entry>boolean</entry>
-            <entry><literal>no</literal></entry>
-          </row>
-          <row>
-            <entry><literal>sidebar_next_new_wrap</literal></entry>
-            <entry>boolean</entry>
-            <entry><literal>no</literal></entry>
-          </row>
-          <row>
-            <entry><literal>sidebar_refresh_time</literal></entry>
-            <entry>number</entry>
-            <entry><literal>60</literal></entry>
-          </row>
-          <row>
-            <entry><literal>sidebar_short_path</literal></entry>
-            <entry>boolean</entry>
-            <entry><literal>no</literal></entry>
-          </row>
-          <row>
-            <entry><literal>sidebar_sort_method</literal></entry>
-            <entry>enum</entry>
-            <entry><literal>SORT_ORDER</literal></entry>
-          </row>
-          <row>
-            <entry><literal>sidebar_visible</literal></entry>
-            <entry>boolean</entry>
-            <entry><literal>no</literal></entry>
-          </row>
-          <row>
-            <entry><literal>sidebar_whitelist</literal></entry>
-            <entry>list</entry>
-            <entry>(empty)</entry>
-          </row>
-          <row>
-            <entry><literal>sidebar_width</literal></entry>
-            <entry>number</entry>
-            <entry><literal>20</literal></entry>
-          </row>
-        </tbody>
+       <thead>
+         <row>
+           <entry>Name</entry>
+           <entry>Type</entry>
+           <entry>Default</entry>
+         </row>
+       </thead>
+       <tbody>
+         <row>
+           <entry><literal>sidebar_delim_chars</literal></entry>
+           <entry>string</entry>
+           <entry><literal>/.</literal></entry>
+         </row>
+         <row>
+           <entry><literal>sidebar_divider_char</literal></entry>
+           <entry>string</entry>
+           <entry><literal>|</literal></entry>
+         </row>
+         <row>
+           <entry><literal>sidebar_folder_indent</literal></entry>
+           <entry>boolean</entry>
+           <entry><literal>no</literal></entry>
+         </row>
+         <row>
+           <entry><literal>sidebar_format</literal></entry>
+           <entry>string</entry>
+           <entry><literal>%B%*  %n</literal></entry>
+         </row>
+         <row>
+           <entry><literal>sidebar_indent_string</literal></entry>
+           <entry>string</entry>
+           <entry><literal>&nbsp;&nbsp;</literal> (two spaces)</entry>
+         </row>
+         <row>
+           <entry><literal>sidebar_new_mail_only</literal></entry>
+           <entry>boolean</entry>
+           <entry><literal>no</literal></entry>
+         </row>
+         <row>
+           <entry><literal>sidebar_next_new_wrap</literal></entry>
+           <entry>boolean</entry>
+           <entry><literal>no</literal></entry>
+         </row>
+         <row>
+           <entry><literal>sidebar_refresh_time</literal></entry>
+           <entry>number</entry>
+           <entry><literal>60</literal></entry>
+         </row>
+         <row>
+           <entry><literal>sidebar_short_path</literal></entry>
+           <entry>boolean</entry>
+           <entry><literal>no</literal></entry>
+         </row>
+         <row>
+           <entry><literal>sidebar_sort_method</literal></entry>
+           <entry>enum</entry>
+           <entry><literal>SORT_ORDER</literal></entry>
+         </row>
+         <row>
+           <entry><literal>sidebar_visible</literal></entry>
+           <entry>boolean</entry>
+           <entry><literal>no</literal></entry>
+         </row>
+         <row>
+           <entry><literal>sidebar_whitelist</literal></entry>
+           <entry>list</entry>
+           <entry>(empty)</entry>
+         </row>
+         <row>
+           <entry><literal>sidebar_width</literal></entry>
+           <entry>number</entry>
+           <entry><literal>20</literal></entry>
+         </row>
+       </tbody>
       </tgroup>
     </table>
   </sect2>

diff --git a/init.h b/init.h
index 47fdc23217b0a422ee97b2e413865a4b556291e7..3f050f587259231334e199efb8db66c4908c309d 100644 (file)
--- a/init.h
+++ b/init.h
@@ -2699,7 +2699,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
@@ -2725,6 +2725,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 "  " },
   /*