X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/b7304e60fb277bc0d977a97ec5a2fe7a9f495be5..d90c0aac81f9d6f5eeaa837e631519bc7369e7ae:/.mutt/keybindings

diff --git a/.mutt/keybindings b/.mutt/keybindings
index c3e649c..bc09bca 100644
--- a/.mutt/keybindings
+++ b/.mutt/keybindings
@@ -6,6 +6,9 @@ bind index,pager	<up>	previous-entry
 bind index,pager	<down>	next-entry
 bind index,pager	p	previous-undeleted
 bind index,pager	n	next-undeleted
+bind index,pager	\eS	decode-save
+bind index,pager	\eU	undelete-subthread
+bind index,pager	\eD	delete-subthread
 #bind pager		<up>	previous-line
 #bind pager		<down>	next-line
 #bind index,pager	<left>	previous-undeleted
@@ -13,7 +16,7 @@ bind index,pager	n	next-undeleted
 
 bind pager,index	<backtab>	previous-unread
 
-#macro pager,index	p	":<enter>" "do nothing"
+#macro pager,index	p	"<enter-command><enter>" "do nothing"
 
 ##bind index	p	previous-undeleted
 ##bind index	n	next-undeleted
@@ -21,26 +24,28 @@ bind pager,index	<backtab>	previous-unread
 ##macro index	L	"<list-reply><save-message>=store<enter>"
 macro index		S	"<tag-prefix><save-message>=store<enter><sync-mailbox>" "save messages to store"
 macro 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>=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>"
-macro index,pager	\eD	"<delete-subthread>"
+macro index		\er	'<tag-prefix><save-message>=resubmit<enter><sync-mailbox>' "resubmit messages"
+macro pager		\er	'<save-message>=resubmit<enter><sync-mailbox>' "resubmit message"
+
+macro index,pager	E	'<enter-command>source "$my_confdir/supersede-header X-Tickle get-timestamp|"<enter><next-undeleted><enter-command>push \er<enter>' "schedule messages with tickler"
+macro index,pager	\ex	'<enter-command>source "$my_confdir/remove-header X-Postponed|"<enter>' "release postponed messages"
+
 macro index,pager	\es	"<change-folder>=store<enter>" "go to store folder"
 macro index,pager	\ed	"<change-folder>=debian<enter>" "go to debian folder"
 macro index,pager	\ei	"<change-folder>=inbox<enter>" "go to inbox folder"
 macro index,pager	\eu	"<change-folder>=ul<enter>" "go to ul folder"
 macro index,pager	\ea	"<change-folder>=admin<enter>" "go to admin folder"
 
-macro index,pager	\eR	":source $my_confdir/muttrc<enter>" "reload muttrc"
-macro compose	\eR	":source $my_confdir/muttrc<enter>" "reload muttrc"
+macro index,pager	\eR	"<enter-command>source $my_confdir/muttrc<enter>" "reload muttrc"
+macro compose	\eR	"<enter-command>source $my_confdir/muttrc<enter>" "reload muttrc"
 
 macro index		X	"<tag-prefix><save-message>=retrain/spam<enter>" "retrain message as spam"
 macro pager		X	"<save-message>=retrain/spam<enter>" "retrain message as spam"
 macro index		Z	"<tag-prefix><save-message>=retrain/ham<enter>" "retrain message as ham"
 macro pager		Z	"<save-message>=retrain/ham<enter>" "retrain message as ham"
 
-macro index,pager	\Cb	':set my_pipe_decode="$pipe_decode"<enter>:set pipe_decode<enter><pipe-message>/usr/bin/urlview<enter>:set pipe_decode="$my_pipe_decode"<enter>' "invoke urlview"
+macro index,pager	\Cb	'<enter-command>set my_pipe_decode="$pipe_decode"<enter><enter-command>set pipe_decode<enter><pipe-message>/usr/bin/urlview<enter><enter-command>set pipe_decode="$my_pipe_decode"<enter>' "invoke urlview"
 
 macro compose	Y	'<edit-fcc><kill-line><enter><send-message>' "send message without storing"
 macro compose	\Cy	'<pgp-menu>cY' "send message without storing or signing"
@@ -52,9 +57,9 @@ macro pager		\Co	'<save-message>imaps://logcheck-todo%40madduck.net:logcheck@ima
 macro index,pager	\eo	'<change-folder>imaps://logcheck-todo%40madduck.net:logcheck@imap.madduck.net<enter>' 'go to logcheck todo folder'
 
 #TODO this is a hack until switch-profile does not readd headers.
-macro compose	e	':set my_editor="$editor"<enter>:set editor=sensible-editor<enter><edit-headers>:set editor="$my_editor"<enter>' "invoke normal editor to edit message"
-macro index,pager	e	':set my_editor="$editor"<enter>:set editor=sensible-editor<enter><edit>:set editor="$my_editor"<enter>' "invoke normal editor to edit message"
+macro compose	e	'<enter-command>set my_editor="$editor"<enter><enter-command>set editor=sensible-editor<enter><edit-headers><enter-command>set editor="$my_editor"<enter>' "invoke normal editor to edit message"
+macro index,pager	e	'<enter-command>set my_editor="$editor"<enter><enter-command>set editor=sensible-editor<enter><edit><enter-command>set editor="$my_editor"<enter>' "invoke normal editor to edit message"
 
-macro index		\ej	':set my_editor="$editor"<enter>:source "$my_confdir/batch-subject-editor|"<enter><tag-prefix><edit>:set editor="$my_editor"<enter>' "change message subject"
+macro index		\ej	'<enter-command>set my_editor="$editor"<enter><enter-command>source "$my_confdir/batch-subject-editor|"<enter><tag-prefix><edit><enter-command>set editor="$my_editor"<enter>' "change message subject"
 
 # vim:sw=12:noet:sts=12:ts=12:ft=muttrc