X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/d1e39afb6cb4e178e1208e2c33c960c36ef46da3..843e189b8e12d8e580b9d999baa5245722f9db6c:/.mutt/keybindings?ds=inline

diff --git a/.mutt/keybindings b/.mutt/keybindings
index f96033a..a23c46f 100644
--- a/.mutt/keybindings
+++ b/.mutt/keybindings
@@ -21,10 +21,10 @@ bind index		h	noop
 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		\Cs	'<tag-prefix><save-message>=resubmit<enter><sync-mailbox>' "resubmit messages"
-macro pager		\Cs	'<save-message>=resubmit<enter><sync-mailbox>' "resubmit message"
+macro index		\Cl	'<tag-prefix><save-message>=resubmit<enter><sync-mailbox>' "resubmit messages"
+macro pager		\Cl	'<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 \Cs<enter>' "schedule messages with tickler"
+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,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"
@@ -80,10 +80,10 @@ macro index,pager	\er	'<enter-command>set my_editor="$editor"<enter><enter-comma
 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		<F8>	"<enter-command>unset wait_key<enter><shell-escape>~/.mutt/mutt-notmuch --prompt search<enter><change-folder-readonly>~/.cache/mutt_results<enter>" "search mail (using notmuch)"
-macro index		<F9>	"<enter-command>unset wait_key<enter><pipe-message>~/.mutt/mutt-notmuch thread<enter><change-folder-readonly>~/.cache/mutt_results<enter><enter-command>set wait_key<enter>" "search and reconstruct owning thread (using notmuch)"
+# override F6 from notmuch-mutt
+macro index		<F6>	"<enter-command><enter>" "do nothing"
 
-macro attach	e	'<enter-command>set my_mailcap_path="$mailcap_path"<enter><enter-command>set mailcap_path="~/.mutt/mailcap-edit-wrapper"<enter><view-mailcap><enter-command>set mailcap_path="$my_mailcap_path"<enter>' "edit temporary file of attachment"
+macro attach	e	'<enter-command>set my_mailcap_path="$mailcap_path"<enter><enter-command>set mailcap_path="~/.mutt/mailcap.editing"<enter><view-mailcap><enter-command>set mailcap_path="$my_mailcap_path"<enter>' "edit temporary file of attachment"
 
 macro index,pager	M	'<enter-command>set my_weed="$weed"<enter><enter-command>set noweed<enter><pipe-message>formail -czx X-RSS-URL: | xargs sensible-browser<enter><enter-command>set weed="$my_weed"<enter>'