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

diff --git a/colours b/colours
index 27e196c2cf9fdcebd2bc9537129666bd9dc4a575..da729b65ed919225a9cff48e7a03c810579375e8 100644 (file)
--- 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 3e77c909a876f7cf06b369ede973ceaa1cf8e278..e1e27abe82411dcb56b35f33e3225e1c66c622cf 100644 (file)
--- 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 3247f5db2a35717fdf185a469af367ea46febb0d..9c7bf45ca9fa250d144e7e8795d8a9dfd4bcb4cf 100644 (file)
--- 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