From: martin f. krafft <madduck@madduck.net>
Date: Sun, 26 Aug 2007 18:29:23 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/mutt
X-Git-Url: https://git.madduck.net/etc/mutt.git/commitdiff_plain/2b7d2604255995c5479b5ec1d106cf238d6f92c6?hp=3db12ca105f0377ff038fa480c3e41f1d858b985

Merge branch 'master' of ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/mutt
---

diff --git a/colours b/colours
index 27e196c..da729b6 100644
--- a/colours
+++ b/colours
@@ -56,4 +56,9 @@ color index	brightcyan	default	"~T ~D"
 folder-hook .   "uncolor index brightblack default '!~D !~P'"
 folder-hook store "color index brightblack default '!~D !~P'"
 
+#folder-hook .   "uncolor index white magenta '!~D ~h X-Tickle:'"
+folder-hook .   "uncolor index brightwhite magenta '(~N|~O) !~D ~h X-Tickle:'"
+#folder-hook inbox "color index white magenta '!~D ~h X-Tickle:'"
+folder-hook inbox "color index brightwhite magenta '(~N|~O) !~D ~h X-Tickle:'"
+
 # vim:sw=9:noet:sts=9:ts=9:ft=muttrc
diff --git a/lists b/lists
index 3e77c90..e1e27ab 100644
--- a/lists
+++ b/lists
@@ -42,7 +42,7 @@ subscribe community@opensource.mit.edu
 #subscribe comp.lang.c++.moderated@lists.madduck.net
 subscribe cong@agouros.de
 #subscribe cpp@snippets.org
-subscribe crm114-discuss@lists.sourceforge.net
+subscribe crm114-(general|discuss)@lists.sourceforge.net
 #subscribe cryptography@cypherpunks.ch
 #subscribe cryptography@metzdowd.com
 subscribe css-d@lists.css-discuss.org
diff --git a/muttrc b/muttrc
index 3247f5d..9c7bf45 100644
--- a/muttrc
+++ b/muttrc
@@ -4431,6 +4431,8 @@ set xterm_set_titles=yes
 set xterm_title="mutt@%h [%?M?%M/?%m, n:%n]%?V? [%V]?"
 # 
 
+alternative_order text/enriched text/plain text application/postscript image/*
+
 source $my_confdir/colours
 source $my_confdir/headers
 source $my_confdir/alternates