X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/d60226ed4be8d76d12ee1db8f46ee49de9c3a567..3ce03d14acbe7390115450bae85814a6989bfece:/.mutt/muttrc

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 5ef2b95..84f4311 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
@@ -26,8 +25,14 @@ mime_lookup application/octet-stream
 mailto_allow cc in-reply-to references subject body
 
 set my_mutt_mailboxes = "$VARDIR/mutt/mailboxes"
-source "test -f $my_mutt_mailboxes && cat $my_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|"
 
-source "mutt -DF/dev/null | grep -q send_multipart_alternative && cat $my_confdir/multipart-alternative|"
+# 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|"