From 14380e3ce49659ee5f731520f69ce3de55eb92d4 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Fri, 29 Feb 2008 15:33:03 +0100
Subject: [PATCH] fix up tickler-related stuff

---
 .mutt/colours     | 10 ++--------
 .mutt/keybindings |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.mutt/colours b/.mutt/colours
index e36c39a..3cad257 100644
--- a/.mutt/colours
+++ b/.mutt/colours
@@ -53,19 +53,13 @@ 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 .         "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/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>"
-- 
2.39.2