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

diff --git a/.mutt/alternates b/.mutt/alternates
index af2e2f292696b315e6381e285c3390abc2b4599c..c14d5a9ace7e6990ac3be813b320fd30f31b64f4 100644 (file)
--- a/.mutt/alternates
+++ b/.mutt/alternates
@@ -29,7 +29,7 @@ alternates .+@limerence\.org
 alternates .+@belligerence\.net
 alternates ma(rtin|dduck)@alpinflegel\.de
 alternates ma(rtin|dduck)@krafftwerk\..+
-alternates martin@krafft.(de|ch)
+alternates martin@krafft\.(de|ch|ie)
 alternates comments\+.+@blog\.madduck\.net
 #alternates .+@(rw|int|home)\.madduck\.net
 

diff --git a/.mutt/edit-header b/.mutt/edit-header
index c87717acfaec0f889377086982e2fa518635777c..07817d25924c40201cd7f74808c053bad75da7d6 100755 (executable)
--- a/.mutt/edit-header
+++ b/.mutt/edit-header
@@ -60,9 +60,12 @@ case "$0" in
 
 esac
 
-echo "set my_editor=\"\$editor\'"
-echo "set editor=\"$editor\""
-#echo "push <tag-prefix>"
-echo "push <edit>"
-# we need to push this so it happens after the editing
-echo "push :set editor=\"\$my_editor\"<enter>"
+echo "set my_editor=\"\$editor\""
+echo "set my_filter=\"$editor\""
+echo -n "push '"
+echo -n "<enter-command>set editor=\"\$my_filter\"<enter>"
+echo -n "<edit>"
+echo -n "<enter-command>set editor=\"\$my_editor\"<enter>"
+echo -n "<enter-command>unset my_filter<enter>"
+echo -n "<enter-command>unset my_editor<enter>"
+echo "'"

diff --git a/.mutt/hooks b/.mutt/hooks
index ef4d92abf774a58bc979e73107f733049f3885f2..3201f6c1fd98b9ce52b15a19497bd26fa3c74c4c 100644 (file)
--- a/.mutt/hooks
+++ b/.mutt/hooks
@@ -1,5 +1,8 @@
 save-hook . =store
 
+send-hook . 'set record==store'
+send-hook '~f phd(\\+.+)?@martin-krafft\\.net' 'set record==phd'
+
 #send-hook '~C @bugs\.debian\.org' 'my_hdr X-Debbugs-No-Ack: please spare me'
 send-hook '~C @packages\.qa\.debian\.org' 'my_hdr X-PTS-Approved: please'
 #send-hook '~C -request@' 'my_hdr X-Record: discard'

diff --git a/.mutt/lists b/.mutt/lists
index 6ffc265dd21f8c4ebe642f481f307c748b6b0371..55328b1b41d5a3595be0cbe1e85e8c6aa1432437 100644 (file)
--- a/.mutt/lists
+++ b/.mutt/lists
@@ -232,5 +232,6 @@ subscribe grub-devel@gnu.org
 subscribe zsh-users@sunsite.dk
 subscribe linux-bluetooth@vger.kernel.org
 subscribe unbound-users@unbound.net
+subscribe spl-discuss@lists.alioth.debian.org
 
 # vim:ft=muttrc

diff --git a/.muttprintrc b/.muttprintrc
index 3d093c0bb55152a909957712579b72a39c03bf76..74e29ebc25abdc202ac11a7d07478d00eb1b1a78 100644 (file)
--- a/.muttprintrc
+++ b/.muttprintrc
@@ -30,7 +30,7 @@ XFACE="off"
 # Possible values are "off" or "on"
 #
 # For Postscript duplex printer set it to "printer"
-DUPLEX="on"
+DUPLEX="printer"
 
 #
 # Here you can turn on or off the paper save mode