From: martin f. krafft <madduck@madduck.net>
Date: Wed, 5 Mar 2008 13:27:53 +0000 (+0100)
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/087697481733b88d2b3b62ba65499234926e5c2b?hp=b661129a68a26d82d57d19d4197955adc8d491af

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

diff --git a/.mutt/add-tickle-stamp b/.mutt/add-tickle-stamp
index 4adf491..715ceff 100755
--- a/.mutt/add-tickle-stamp
+++ b/.mutt/add-tickle-stamp
@@ -22,9 +22,9 @@ else
   case "$arg" in
     *[0-9]w) date="now + ${arg%w} weeks 00:00";;
     *[0-9]m) date="now + ${arg%m} months 00:00";;
-    *[0-9]h) date="now + ${arg%h} hours";;
     *[0-9]d) date="now + ${arg%d} days 00:00";;
-    @#[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
+    *[0-9]h) date="now + ${arg%h} hours";;
+    @[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
       date="@${arg#@}";;
     *' '*) date="$args";;
     *[!0-9]*) 
diff --git a/.mutt/colours b/.mutt/colours
index e36c39a..3e7614d 100644
--- a/.mutt/colours
+++ b/.mutt/colours
@@ -53,19 +53,15 @@ color index	brightwhite	red	"~T (~N|~O) ~F"
 color index	cyan		default	"~D"
 color index	brightcyan	default	"~T ~D"
 
-folder-hook .         "color index brightwhite magenta '(~N|~O) !~D ~h X-Tickle:'"
-folder-hook tickler "uncolor index brightwhite magenta '(~N|~O) !~D ~h X-Tickle:'"
-
 folder-hook .   "uncolor index brightblack default '!~D !~P'"
 folder-hook store "color index brightblack default '!~D !~P'"
 
+folder-hook .   "uncolor index brightwhite magenta '~h X-Postponed:'"
+folder-hook store "color index brightwhite magenta '~h X-Postponed:'"
+folder-hook .     "color index brightwhite magenta '(~N|~O) !~D ~h X-Tickle:'"
+
 folder-hook .         "color index default red '!~P ~H .'"
 folder-hook spam    "uncolor index default red '!~P ~H .'"
 folder-hook retrain "uncolor index default red '!~P ~H .'"
 
-#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/.mutt/headers b/.mutt/headers
index 892048f..fe02da2 100644
--- a/.mutt/headers
+++ b/.mutt/headers
@@ -13,7 +13,7 @@ hdr_order x-trained-as x-crm114-autotrain
 hdr_order user-agent x-mailer x-newsreader
 hdr_order x-justme
 hdr_order x-autoreplied
-hdr_order x-tickle
+hdr_order x-tickle x-postponed x-was-postponed
 
 ignore *
 unignore date
@@ -30,6 +30,6 @@ unignore x-spam:
 #unignore user-agent x-mailer x-newsreader
 unignore x-justme
 unignore x-autoreplied
-unignore x-tickle
+unignore x-tickle x-postponed x-was-postponed
 
 # vim:ft=muttrc
diff --git a/.mutt/keybindings b/.mutt/keybindings
index d88fddd..f2a5312 100644
--- a/.mutt/keybindings
+++ b/.mutt/keybindings
@@ -19,7 +19,7 @@ bind pager,index	<backtab>	previous-unread
 
 ##macro index	L	"<list-reply><save-message>=store<enter>"
 macro index,pager	S	"<save-message>=store<enter><sync-mailbox>" "save message to store"
-macro index,pager	E	':set my_editor="$editor"<enter>:set editor="$my_confdir/add-tickle-stamp"<enter><edit><toggle-new><save-message>=tickler<enter><sync-mailbox>:set editor="$my_editor"<enter>' "schedule message with tickler"
+macro index,pager	E	':set my_editor="$editor"<enter>:set editor="$my_confdir/add-tickle-stamp"<enter><edit><toggle-new><save-message>=resubmit<enter><sync-mailbox>:set editor="$my_editor"<enter>' "schedule message with tickler"
 
 macro index,pager	\eS	"<decode-save>"
 macro index,pager	\eU	"<undelete-subthread>"
diff --git a/.mutt/lists b/.mutt/lists
index 3561543..d076370 100644
--- a/.mutt/lists
+++ b/.mutt/lists
@@ -80,7 +80,7 @@ subscribe debian-publicity@lists.debian.org
 subscribe debian-qa@lists.debian.org
 subscribe debian-release@lists.debian.org
 subscribe debian-security@lists.debian.org
-subscribe debian-unizh@lists.madduck.net
+subscribe community@lists.debian.ch
 subscribe debian-user@lists.debian.org
 subscribe debian-volatile@volatile.debian.org
 subscribe debian-vote@lists.debian.org
@@ -203,7 +203,7 @@ subscribe trac-users@googlegroups.com
 subscribe users@spamassassin.apache.org
 #subscribe vbce-herren1@lists.madduck.net
 subscribe vcs-home@lists.madduck.net
-subscribe vcs-pkg@lists.madduck.net
+subscribe vcs-pkg@lists.alioth.debian.org
 #subscribe video4linux-list@redhat.com
 #subscribe vim-multibyte@vim.org
 subscribe vim(@vim.org|_use@googlegroups\.com)
@@ -221,5 +221,7 @@ lists zwiki@zwiki.org
 subscribe revctrl@lists.zooko.com
 subscribe (chat|announce)@lists.mel8ourne.org
 subscribe irssi@dragoncat.net
+subscribe iif-discussion@forecasters.org
+subscribe netfilter@vger.kernel.org
 
 # vim:ft=muttrc