make sidebar settings sourcing dependent on patch existence

[etc/mutt.git] / .mutt / muttrc

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 5d0247743386318d246b37ad353730d9844a0c6e..90bd690bda6d6b232ddcce07d7c4e6b265720766 100644 (file)
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -2,8 +2,8 @@
 
 set my_confdir="$HOME/.mutt"
 
-set my_attribution_de="Zitiere aus E-Mail von \"%n\" vom %{%Y-%m-%d} um %{%H:%M Uhr %z}:"
-set my_attribution_en="Quoting \"%n\", who wrote on %{%Y-%m-%d} at %{%H:%M Uhr %z}:"
+set my_attribution_de="Hinsichtlich folgendem, das \"%n\" am %{%Y-%m-%d} um %{%H:%M Uhr %Z} schrieb:"
+set my_attribution_en="Regarding the following, written by \"%n\" on %{%Y-%m-%d} at %{%H:%M Uhr %Z}:"
 
 source $my_confdir/confvars
 source $my_confdir/colours
@@ -13,12 +13,11 @@ source $my_confdir/keybindings
 source $my_confdir/lists
 source $my_confdir/spam
 source $my_confdir/hooks
-source $my_confdir/sidebar
 
-auto_view text/html application/ics text/calendar
+auto_view text/html text/calendar
 #auto_view application/x-gunzip application/x-tar-gz application/x-tar application/x-gtar
 #auto_view application/postscript
-alternative_order multipart/mixed multipart/related text/html text/enriched text/*
+alternative_order multipart/mixed multipart/related text/calendar text/html text/enriched text/*
 #alternative_order text/plain text/enriched text/html
 #alternative_order text/enriched text/plain text application/postscript image/*
 mime_lookup application/octet-stream
@@ -29,3 +28,9 @@ 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|"
+
+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|"