X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/2fdc884286a726deb55cdb25820172ea920f133d..ab4a7bac0c452d69330b94acb6871f37a952217f:/.mutt/keybindings?ds=sidebyside

diff --git a/.mutt/keybindings b/.mutt/keybindings
index 6a33e3b..a23c46f 100644
--- a/.mutt/keybindings
+++ b/.mutt/keybindings
@@ -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>'