Fix sidebar documentation a bit. (closes #3859)

Sidebar_whitelist is a command, not a variable.  Also add a blurb about what it does.

Fix the sort order for $sidebar_divider_char and $sidebar_delim_chars.

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index df90ec61cbd7f27b26490791af3cc9d0d7f0ce8d..2a4eaa3618c54da6181108b793a1e7f966bfe51e 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -12933,6 +12933,13 @@ set sort_browser="reverse-size"
         <replaceable class="parameter">mailbox</replaceable>
       </arg>
     </cmdsynopsis>
+
+    <para>
+      This command specifies mailboxes that will always be displayed
+      in the sidebar, even if <link
+      linkend="sidebar-new-mail-only">$sidebar_new_mail_only</link>
+      is set and the mailbox does not contain new mail.
+    </para>
   </sect2>
 
   <sect2 id="sidebar-colors">

diff --git a/init.h b/init.h
index a6aca1521ed992d0db65de1587e17529c0af660c..c576eb5bf790819099e17701b04f52589370f6e9 100644 (file)
--- a/init.h
+++ b/init.h
@@ -3028,13 +3028,6 @@ struct option_t MuttVars[] = {
   */
 #endif
 #ifdef USE_SIDEBAR
-  { "sidebar_divider_char", DT_STR, R_SIDEBAR, UL &SidebarDividerChar, UL "|" },
-  /*
-  ** .pp
-  ** This specifies the characters to be drawn between the sidebar (when
-  ** visible) and the other Mutt panels. ASCII and Unicode line-drawing
-  ** characters are supported.
-  */
   { "sidebar_delim_chars", DT_STR, R_SIDEBAR, UL &SidebarDelimChars, UL "/." },
   /*
   ** .pp
@@ -3053,6 +3046,13 @@ struct option_t MuttVars[] = {
   ** .pp
   ** \fBSee also:\fP $$sidebar_short_path, $$sidebar_folder_indent, $$sidebar_indent_string.
   */
+  { "sidebar_divider_char", DT_STR, R_SIDEBAR, UL &SidebarDividerChar, UL "|" },
+  /*
+  ** .pp
+  ** This specifies the characters to be drawn between the sidebar (when
+  ** visible) and the other Mutt panels. ASCII and Unicode line-drawing
+  ** characters are supported.
+  */
   { "sidebar_folder_indent", DT_BOOL, R_SIDEBAR, OPTSIDEBARFOLDERINDENT, 0 },
   /*
   ** .pp