X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/54bc97853a9d2c6f3d1ad0ad584f76f2939af2aa..a83d50d5a64488deb3796bbd0ca0a03b0516cc77:/.mutt/keybindings?ds=sidebyside

diff --git a/.mutt/keybindings b/.mutt/keybindings
index 4af9b42..109fff6 100644
--- a/.mutt/keybindings
+++ b/.mutt/keybindings
@@ -19,21 +19,19 @@ macro index	p	"<enter-command><enter>" "do nothing"
 
 bind index		h	noop
 
-##macro index	L	"<list-reply><save-message>=store<enter>"
-macro index		S	"<tag-prefix><save-message>=store<enter>" "save messages to store"
-macro pager		S	"<save-message>=store<enter>" "save message to store"
-
-macro index,pager	E	'<enter-command> source "$my_confdir/supersede-header X-Tickle get-timestamp|"<enter><next-undeleted><enter-command> push S<enter>' "schedule messages with tickler"
+macro index		\es	"<tag-prefix><enter-command> set my_weed=\$weed<enter><enter-command> set my_resolve=\$resolve<enter><enter-command> set noweed noresolve<enter><decode-save>^<enter><next-entry><clear-flag>n<enter-command> set weed=\$my_weed<enter><enter-command> set resolve=\$my_resolve<enter>" "decode message to current folder"
+macro pager		\es	"<enter-command> set my_weed=\$weed<enter><enter-command> set my_resolve=\$resolve<enter><enter-command> set noweed noresolve<enter><decode-save>^<enter><next-entry><clear-flag>n<enter-command> set weed=\$my_weed<enter><enter-command> set resolve=\$my_resolve<enter>" "decode message to current folder"
+macro index		\eS	"<tag-prefix><save-message><<enter>" "save messages to store"
+macro pager		\eS	"<save-message><<enter>" "save message to store"
+macro index		S	"<tag-prefix><enter-command> set my_weed=\$weed<enter><enter-command> set my_resolve=\$resolve<enter><enter-command> set noweed noresolve<enter><decode-save><<enter><next-entry><enter-command> set weed=\$my_weed<enter><enter-command> set resolve=\$my_resolve<enter>" "decode message to $record folder"
+macro pager		S	"<enter-command> set my_weed=\$weed<enter><enter-command> set my_resolve=\$resolve<enter><enter-command> set noweed noresolve<enter><decode-save><<enter><next-entry><enter-command> set weed=\$my_weed<enter><enter-command> set resolve=\$my_resolve<enter><display-toggle-weed><display-toggle-weed>" "decode message to $record folder"
+
+macro index,pager	E	'<enter-command> source "$my_confdir/supersede-header X-Tickle get-timestamp|"<enter><next-undeleted><save-message>=resubmit<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	\ec	"<change-folder>=debian/debconf<enter>" "go to debconf 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	\ea	"<change-folder>=ardex<enter>" "go to ardex folder"
-macro index,pager	\ek	"<change-folder>=kbkg<enter>" "go to kbkg folder"
-macro index,pager	\eu	"<change-folder>=uniwh<enter>" "go to uniwh folder"
-macro index,pager	\et	"<change-folder>=toni<enter>" "go to toni folder"
+macro index,pager	\e,	"<change-folder><<enter>" "go to $record folder"
+macro index,pager	\e.	"<change-folder>><enter>" "go to $spool folder"
+macro index,pager	\e1	"<change-folder>!<enter>" "go to inbox folder"
 
 bind index		\eT	tag-thread
 bind index,pager	\eK	mail-key
@@ -46,7 +44,7 @@ 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	"<enter-command> set my_pipe_decode=\$pipe_decode<enter><enter-command> set pipe_decode<enter><pipe-message>/usr/bin/urlscan<enter><enter-command> set pipe_decode=\$my_pipe_decode<enter>" "invoke urlscan"
+macro index,pager,attach,compose	\Cb	"<enter-command> set my_pipe_decode=\$pipe_decode<enter><enter-command> set pipe_decode<enter><pipe-message>/usr/bin/urlscan<enter><enter-command> set pipe_decode=\$my_pipe_decode<enter>" "invoke urlscan"
 
 macro compose	Y	'<edit-fcc><kill-line><enter><send-message>' "send message without storing"
 macro compose	\Cy	'<pgp-menu>c<send-message>' "send message without signing"
@@ -63,17 +61,15 @@ macro pager	p	'<pipe-message>less -c<enter>' "pipe message into pager"
 bind pager		[	half-up
 bind pager		]	half-down
 
-macro index,pager	\eS	"<enter-command> set my_weed=\$weed<enter><enter-command> set my_resolve=\$resolve<enter><enter-command> set noweed noresolve<enter><decode-save>^<enter><next-entry><clear-flag>n<enter-command> set weed=\$my_weed<enter><enter-command> set resolve=\$my_resolve<enter>" "decode message to current folder"
-
 #TODO this is a hack until switch-profile does not readd headers.
 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	"<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"
 
-macro index,pager	\er	"<enter-command> set my_editor=\$editor<enter><enter-command> set editor=~/.mutt/reuse-message \$my_editor<enter><reply><enter-command> set editor=\$my_editor<enter>" "invoke normal editor to edit message"
-macro index,pager	\eg	"<enter-command> set my_editor=\$editor<enter><enter-command> set editor=~/.mutt/reuse-message \$my_editor<enter><group-reply><enter-command> set editor=\$my_editor<enter>" "invoke normal editor to edit message"
-macro index,pager	\el	"<enter-command> set my_editor=\$editor<enter><enter-command> set editor=~/.mutt/reuse-message \$my_editor<enter><list-reply><enter-command> set editor=\$my_editor<enter>" "invoke normal editor to edit message"
+macro index,pager	\er	"<enter-command> set my_editor=\$editor<enter><enter-command> set editor=\"~/.mutt/reuse-message \$my_editor\"<enter><reply><enter-command> set editor=\$my_editor<enter>" "invoke normal editor to edit message"
+macro index,pager	\eg	"<enter-command> set my_editor=\$editor<enter><enter-command> set editor=\"~/.mutt/reuse-message \$my_editor\"<enter><group-reply><enter-command> set editor=\$my_editor<enter>" "invoke normal editor to edit message"
+macro index,pager	\el	"<enter-command> set my_editor=\$editor<enter><enter-command> set editor=\"~/.mutt/reuse-message \$my_editor\"<enter><list-reply><enter-command> set editor=\$my_editor<enter>" "invoke normal editor to edit message"
 
 # override F6 from notmuch-mutt
 macro index		<F6>	"<enter-command><enter>" "do nothing"