X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/8b73b252490c2be0de6565ad0232672c6818583e..404a4537df5dd9e1b2522b7d0b0dc480577a6ec3:/.mutt/muttrc

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 7eea8cc..0170c22 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -13,7 +13,6 @@ source $my_confdir/keybindings
 source $my_confdir/lists
 source $my_confdir/spam
 source $my_confdir/hooks
-source $my_confdir/sidebar
 
 auto_view text/html text/calendar
 #auto_view application/x-gunzip application/x-tar-gz application/x-tar application/x-gtar
@@ -29,3 +28,11 @@ set my_mutt_mailboxes = "$VARDIR/mutt/mailboxes"
 source "test -f $my_mutt_mailboxes && cat $my_mutt_mailboxes|"
 
 source "test -f $alias_file && cat $alias_file 2>/dev/null || echo unset alias_file|"
+
+# only source sidebar settings if the sidebar patch exist, i.e. default is
+# non-zero
+source "test -z $sidebar_visible || cat $my_confdir/sidebar|"
+
+# only source multipart/alternative settings if the multipart/alternative
+# patch exist, i.e. default is non-zero
+source "test -z $send_multipart_alternative || cat $my_confdir/multipart-alternative|"