Fix notmuch config

diff --git a/muttrc.dot.link b/muttrc.dot.link
index fa6dd2a69f79596641ef3aea32b5ab44ca41d47a..106a78f03008304eb25cee04e102865a53e3da2e 100644 (file)
--- a/muttrc.dot.link
+++ b/muttrc.dot.link
@@ -264,11 +264,32 @@ macro pager \cb <pipe-entry>'urlview'<enter> 'Follow links with urlview'
 # ----------------------------------------------------------------------------------------
 # Notmuch
 # For info look at http://upsilon.cc/~zack/blog/posts/2011/01/how_to_use_Notmuch_with_Mutt
+#                  https://wiki.archlinux.org/index.php/Notmuch
 # ----------------------------------------------------------------------------------------
-macro browser <F8> "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch --prompt search\
-  <enter><change-dir>../.cache/<enter><search>mutt_results<enter><enter>" "search mail (using notmuch)"
-
-macro index <F7> "<tag-prefix><pipe-message>~/apps/scripts/mutt-notmuch-tag<enter>" "Tag messages (using notmuch)"
+#macro browser <F8> "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch --prompt search\
+#  <enter><change-dir>../.cache/<enter><search>mutt_results<enter><enter>" "search mail (using notmuch)"
+#
+macro index,pager <F7> "<tag-prefix><pipe-message>~/apps/utils-mail/mutt-notmuch-tag<enter>" "Tag messages (using notmuch)"
+
+macro index,pager <F8> \
+"<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter>\
+<shell-escape>notmuch-mutt -r --prompt search<enter>\
+<change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`<enter>\
+<enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
+"notmuch: search mail"
+
+macro index,pager <F9> \
+"<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter>\
+<pipe-message>notmuch-mutt -r thread<enter>\
+<change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`<enter>\
+<enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
+"notmuch: reconstruct thread"
+
+macro index,pager <F6> \
+"<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter>\
+<pipe-message>notmuch-mutt tag -- -inbox<enter>\
+<enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
+"notmuch: remove message from inbox"
 
 # ----------
 # Bogofilter