Date: Thu, 14 Feb 2013 16:12:47 -0800
From: "Kevin J. McCarthy" <kevin@8t8.us>
To: notmuch@notmuchmail.org
Subject: [PATCH] notmuch-mutt: improve robustness of mutt macros
Message-ID: <20130215001247.GB3247@zaogao.lan>
Mail-Followup-To: notmuch@notmuchmail.org, Stefano Zacchiroli
 <zack@upsilon.cc>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="NMuMz9nt05w80d4+"
Content-Disposition: inline
OpenPGP: id=B6B1CD9613699FB8;
	url=http://www.8t8.us/configs/13699FB8.asc.pubkey; preference=sign
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: Stefano Zacchiroli <zack@upsilon.cc>
Precedence: list


--NMuMz9nt05w80d4+
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Details:
- $pipe_decode is turned off, to prevent message-id from being
  filtered out by "ignore" settings in the muttrc.
- Original values for $pipe_decode and $wait_key are saved and restored.
- The macros, being much longer now, are line wrapped for improved
  readability.
---

This patch would be in addition to the one sent by Stefano in
id:20130214083713.GA4123@upsilon.cc

His patch improves notmuch-mutt itself.  This patch improves the macros
to invoke notmuch-mutt.

 contrib/notmuch-mutt/notmuch-mutt    |   16 +++++++++++++---
 contrib/notmuch-mutt/notmuch-mutt.rc |   16 +++++++++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmu=
ch-mutt
index bc97908..00c5ef8 100755
--- a/contrib/notmuch-mutt/notmuch-mutt
+++ b/contrib/notmuch-mutt/notmuch-mutt
@@ -270,13 +270,23 @@ the following in your Mutt configuration (usually one=
 of: F<~/.muttrc>,
 F</etc/Muttrc>, or a configuration snippet under F</etc/Muttrc.d/>):
=20
     macro index <F8> \
-          "<enter-command>unset wait_key<enter><shell-escape>notmuch-mutt =
-r --prompt search<enter><change-folder-readonly>~/.cache/notmuch/mutt/resu=
lts<enter>" \
+    "<enter-command>set my_old_pipe_decode=3D\$pipe_decode my_old_wait_key=
=3D\$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=3D\$my_old_pipe_decode wait_key=3D\$my_=
old_wait_key<enter>" \
           "notmuch: search mail"
+
     macro index <F9> \
-          "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt =
-r thread<enter><change-folder-readonly>~/.cache/notmuch/mutt/results<enter=
><enter-command>set wait_key<enter>" \
+    "<enter-command>set my_old_pipe_decode=3D\$pipe_decode my_old_wait_key=
=3D\$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=3D\$my_old_pipe_decode wait_key=3D\$my_=
old_wait_key<enter>" \
           "notmuch: reconstruct thread"
+
     macro index <F6> \
-          "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt =
tag -- -inbox<enter>" \
+    "<enter-command>set my_old_pipe_decode=3D\$pipe_decode my_old_wait_key=
=3D\$wait_key nopipe_decode nowait_key<enter>\
+    <pipe-message>notmuch-mutt tag -- -inbox<enter>\
+    <enter-command>set pipe_decode=3D\$my_old_pipe_decode wait_key=3D\$my_=
old_wait_key<enter>" \
           "notmuch: remove message from inbox"
=20
 The first macro (activated by <F8>) prompts the user for notmuch search te=
rms
diff --git a/contrib/notmuch-mutt/notmuch-mutt.rc b/contrib/notmuch-mutt/no=
tmuch-mutt.rc
index ddc4b48..6b299dc 100644
--- a/contrib/notmuch-mutt/notmuch-mutt.rc
+++ b/contrib/notmuch-mutt/notmuch-mutt.rc
@@ -1,9 +1,19 @@
 macro index <F8> \
-      "<enter-command>unset wait_key<enter><shell-escape>notmuch-mutt -r -=
-prompt search<enter><change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/=
=2Ecache}/notmuch/mutt/results`<enter>" \
+"<enter-command>set my_old_pipe_decode=3D\$pipe_decode my_old_wait_key=3D\=
$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=3D\$my_old_pipe_decode wait_key=3D\$my_old_=
wait_key<enter>" \
       "notmuch: search mail"
+
 macro index <F9> \
-      "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt -r t=
hread<enter><change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/n=
otmuch/mutt/results`<enter><enter-command>set wait_key<enter>" \
+"<enter-command>set my_old_pipe_decode=3D\$pipe_decode my_old_wait_key=3D\=
$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=3D\$my_old_pipe_decode wait_key=3D\$my_old_=
wait_key<enter>" \
       "notmuch: reconstruct thread"
+
 macro index <F6> \
-      "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag =
-- -inbox<enter>" \
+"<enter-command>set my_old_pipe_decode=3D\$pipe_decode my_old_wait_key=3D\=
$wait_key nopipe_decode nowait_key<enter>\
+<pipe-message>notmuch-mutt tag -- -inbox<enter>\
+<enter-command>set pipe_decode=3D\$my_old_pipe_decode wait_key=3D\$my_old_=
wait_key<enter>" \
       "notmuch: remove message from inbox"
--=20
1.7.10.4


--NMuMz9nt05w80d4+
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQEcBAEBCAAGBQJRHX1/AAoJELaxzZYTaZ+4hN0H/24VkdDDfzyS90jDQQOcRg2j
XfQ0jqx3vEFZxqp9RF9ISSc519wttNyNLvhFE6gppuFWj4d4VGhupwP+YMzYQD7z
a+FQH2WNasiFzj1llNZ53GHwGarSIqWZYK565dAgedBfKQzil0Px9F2EhwuunkvZ
CsW6aZePfEDZQYqKlf2nZT+GW3uR+c142TgNu6s0MLW+zxf7ALQmtJgv42G1kYAS
YF+EcVfMPW+TfKG+XpKaqhTQoUa37jAj5bnuTAaNf9PI4Ci80y/VVKoFkRwL55HC
1iLdl4fI7qQTWzTzFKdyAaLLQYq2SG9/VJgBAq+qqkF3ICpFcZBYGTsrlMl+dCw=
=+1EW
-----END PGP SIGNATURE-----

--NMuMz9nt05w80d4+--