d6/bb293caddc7536b1b88a0458c9dd182d3703c5

   1 Return-Path: <keevan@fastmail.fm>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 2F860431FB6\r
   6         for <notmuch@notmuchmail.org>; Thu, 14 Feb 2013 16:12:51 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.799\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id BFro18UKLlLg for <notmuch@notmuchmail.org>;\r
  17         Thu, 14 Feb 2013 16:12:50 -0800 (PST)\r
  18 Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com\r
  19         [66.111.4.25])\r
  20         (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
  21         (No client certificate requested)\r
  22         by olra.theworths.org (Postfix) with ESMTPS id 5EC0C431FAF\r
  23         for <notmuch@notmuchmail.org>; Thu, 14 Feb 2013 16:12:50 -0800 (PST)\r
  24 Received: from compute1.internal (compute1.nyi.mail.srv.osa [10.202.2.41])\r
  25         by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id A68FE20753;\r
  26         Thu, 14 Feb 2013 19:12:49 -0500 (EST)\r
  27 Received: from frontend1.nyi.mail.srv.osa ([10.202.2.160])\r
  28         by compute1.internal (MEProxy); Thu, 14 Feb 2013 19:12:49 -0500\r
  29 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=8t8.us; h=date\r
  30         :from:to:cc:subject:message-id:mime-version:content-type; s=\r
  31         mesmtp; bh=z4krmFngub0z2y+RfJYc019metg=; b=R+jA9aL/o0LrAI2kAGfAo\r
  32         h6hG7+7j/RK8jHpMZyPHctiL2muV9IO9OlSAmgP3FlvxrXgDvhvTnjMkdMBLpfBv\r
  33         7iIGoek9V9+pZ5SeU5TchNdKP1MfFMT0q6KM022CzR5iPVRHcesZi93weNHG/HZU\r
  34         mY3FFWlpr5RyLXECPLLh3M=\r
  35 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=\r
  36         messagingengine.com; h=date:from:to:cc:subject:message-id\r
  37         :mime-version:content-type; s=smtpout; bh=z4krmFngub0z2y+RfJYc01\r
  38         9metg=; b=ES3wnLrmUitIOB+5Tp0N5Q1HP0Qy45HcR1qMXnBj46qxf9kiTo33lF\r
  39         QM11ywvinNl4vt7JD2g/AwNkzf8uDmWqZ39gr0SHXHwQLOHexBtbpCq8wA6BRj0x\r
  40         d7V6aTnWuge5eD1gmBiBbEcOhPX3SRWMbssUBB6uHW5ltRv6gBthI=\r
  41 X-Sasl-enc: qleg49sPxbSfUNkAPA+G5rw74ZNzhGrJmC41oGWJ683y 1360887169\r
  42 Received: from localhost (unknown [75.170.32.230])\r
  43         by mail.messagingengine.com (Postfix) with ESMTPA id 0282E8E01F3;\r
  44         Thu, 14 Feb 2013 19:12:48 -0500 (EST)\r
  45 Date: Thu, 14 Feb 2013 16:12:47 -0800\r
  46 From: "Kevin J. McCarthy" <kevin@8t8.us>\r
  47 To: notmuch@notmuchmail.org\r
  48 Subject: [PATCH] notmuch-mutt: improve robustness of mutt macros\r
  49 Message-ID: <20130215001247.GB3247@zaogao.lan>\r
  50 Mail-Followup-To: notmuch@notmuchmail.org, Stefano Zacchiroli\r
  51  <zack@upsilon.cc>\r
  52 MIME-Version: 1.0\r
  53 Content-Type: multipart/signed; micalg=pgp-sha256;\r
  54         protocol="application/pgp-signature"; boundary="NMuMz9nt05w80d4+"\r
  55 Content-Disposition: inline\r
  56 OpenPGP: id=B6B1CD9613699FB8;\r
  57         url=http://www.8t8.us/configs/13699FB8.asc.pubkey; preference=sign\r
  58 User-Agent: Mutt/1.5.21 (2010-09-15)\r
  59 Cc: Stefano Zacchiroli <zack@upsilon.cc>\r
  60 X-BeenThere: notmuch@notmuchmail.org\r
  61 X-Mailman-Version: 2.1.13\r
  62 Precedence: list\r
  63 List-Id: "Use and development of the notmuch mail system."\r
  64         <notmuch.notmuchmail.org>\r
  65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  66         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  68 List-Post: <mailto:notmuch@notmuchmail.org>\r
  69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  71         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  72 X-List-Received-Date: Fri, 15 Feb 2013 00:12:51 -0000\r
  73 \r
  74 \r
  75 --NMuMz9nt05w80d4+\r
  76 Content-Type: text/plain; charset=us-ascii\r
  77 Content-Disposition: inline\r
  78 Content-Transfer-Encoding: quoted-printable\r
  79 \r
  80 Details:\r
  81 - $pipe_decode is turned off, to prevent message-id from being\r
  82   filtered out by "ignore" settings in the muttrc.\r
  83 - Original values for $pipe_decode and $wait_key are saved and restored.\r
  84 - The macros, being much longer now, are line wrapped for improved\r
  85   readability.\r
  86 ---\r
  87 \r
  88 This patch would be in addition to the one sent by Stefano in\r
  89 id:20130214083713.GA4123@upsilon.cc\r
  90 \r
  91 His patch improves notmuch-mutt itself.  This patch improves the macros\r
  92 to invoke notmuch-mutt.\r
  93 \r
  94  contrib/notmuch-mutt/notmuch-mutt    |   16 +++++++++++++---\r
  95  contrib/notmuch-mutt/notmuch-mutt.rc |   16 +++++++++++++---\r
  96  2 files changed, 26 insertions(+), 6 deletions(-)\r
  97 \r
  98 diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmu=\r
  99 ch-mutt\r
 100 index bc97908..00c5ef8 100755\r
 101 --- a/contrib/notmuch-mutt/notmuch-mutt\r
 102 +++ b/contrib/notmuch-mutt/notmuch-mutt\r
 103 @@ -270,13 +270,23 @@ the following in your Mutt configuration (usually one=\r
 104  of: F<~/.muttrc>,\r
 105  F</etc/Muttrc>, or a configuration snippet under F</etc/Muttrc.d/>):\r
 106 =20\r
 107      macro index <F8> \\r
 108 -          "<enter-command>unset wait_key<enter><shell-escape>notmuch-mutt =\r
 109 -r --prompt search<enter><change-folder-readonly>~/.cache/notmuch/mutt/resu=\r
 110 lts<enter>" \\r
 111 +    "<enter-command>set my_old_pipe_decode=3D\$pipe_decode my_old_wait_key=\r
 112 =3D\$wait_key nopipe_decode nowait_key<enter>\\r
 113 +    <shell-escape>notmuch-mutt -r --prompt search<enter>\\r
 114 +    <change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/=\r
 115 mutt/results`<enter>\\r
 116 +    <enter-command>set pipe_decode=3D\$my_old_pipe_decode wait_key=3D\$my_=\r
 117 old_wait_key<enter>" \\r
 118            "notmuch: search mail"\r
 119 +\r
 120      macro index <F9> \\r
 121 -          "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt =\r
 122 -r thread<enter><change-folder-readonly>~/.cache/notmuch/mutt/results<enter=\r
 123 ><enter-command>set wait_key<enter>" \\r
 124 +    "<enter-command>set my_old_pipe_decode=3D\$pipe_decode my_old_wait_key=\r
 125 =3D\$wait_key nopipe_decode nowait_key<enter>\\r
 126 +    <pipe-message>notmuch-mutt -r thread<enter>\\r
 127 +    <change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/=\r
 128 mutt/results`<enter>\\r
 129 +    <enter-command>set pipe_decode=3D\$my_old_pipe_decode wait_key=3D\$my_=\r
 130 old_wait_key<enter>" \\r
 131            "notmuch: reconstruct thread"\r
 132 +\r
 133      macro index <F6> \\r
 134 -          "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt =\r
 135 tag -- -inbox<enter>" \\r
 136 +    "<enter-command>set my_old_pipe_decode=3D\$pipe_decode my_old_wait_key=\r
 137 =3D\$wait_key nopipe_decode nowait_key<enter>\\r
 138 +    <pipe-message>notmuch-mutt tag -- -inbox<enter>\\r
 139 +    <enter-command>set pipe_decode=3D\$my_old_pipe_decode wait_key=3D\$my_=\r
 140 old_wait_key<enter>" \\r
 141            "notmuch: remove message from inbox"\r
 142 =20\r
 143  The first macro (activated by <F8>) prompts the user for notmuch search te=\r
 144 rms\r
 145 diff --git a/contrib/notmuch-mutt/notmuch-mutt.rc b/contrib/notmuch-mutt/no=\r
 146 tmuch-mutt.rc\r
 147 index ddc4b48..6b299dc 100644\r
 148 --- a/contrib/notmuch-mutt/notmuch-mutt.rc\r
 149 +++ b/contrib/notmuch-mutt/notmuch-mutt.rc\r
 150 @@ -1,9 +1,19 @@\r
 151  macro index <F8> \\r
 152 -      "<enter-command>unset wait_key<enter><shell-escape>notmuch-mutt -r -=\r
 153 -prompt search<enter><change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/=\r
 154 =2Ecache}/notmuch/mutt/results`<enter>" \\r
 155 +"<enter-command>set my_old_pipe_decode=3D\$pipe_decode my_old_wait_key=3D\=\r
 156 $wait_key nopipe_decode nowait_key<enter>\\r
 157 +<shell-escape>notmuch-mutt -r --prompt search<enter>\\r
 158 +<change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt=\r
 159 /results`<enter>\\r
 160 +<enter-command>set pipe_decode=3D\$my_old_pipe_decode wait_key=3D\$my_old_=\r
 161 wait_key<enter>" \\r
 162        "notmuch: search mail"\r
 163 +\r
 164  macro index <F9> \\r
 165 -      "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt -r t=\r
 166 hread<enter><change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/n=\r
 167 otmuch/mutt/results`<enter><enter-command>set wait_key<enter>" \\r
 168 +"<enter-command>set my_old_pipe_decode=3D\$pipe_decode my_old_wait_key=3D\=\r
 169 $wait_key nopipe_decode nowait_key<enter>\\r
 170 +<pipe-message>notmuch-mutt -r thread<enter>\\r
 171 +<change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt=\r
 172 /results`<enter>\\r
 173 +<enter-command>set pipe_decode=3D\$my_old_pipe_decode wait_key=3D\$my_old_=\r
 174 wait_key<enter>" \\r
 175        "notmuch: reconstruct thread"\r
 176 +\r
 177  macro index <F6> \\r
 178 -      "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag =\r
 179 -- -inbox<enter>" \\r
 180 +"<enter-command>set my_old_pipe_decode=3D\$pipe_decode my_old_wait_key=3D\=\r
 181 $wait_key nopipe_decode nowait_key<enter>\\r
 182 +<pipe-message>notmuch-mutt tag -- -inbox<enter>\\r
 183 +<enter-command>set pipe_decode=3D\$my_old_pipe_decode wait_key=3D\$my_old_=\r
 184 wait_key<enter>" \\r
 185        "notmuch: remove message from inbox"\r
 186 --=20\r
 187 1.7.10.4\r
 188 \r
 189 \r
 190 --NMuMz9nt05w80d4+\r
 191 Content-Type: application/pgp-signature; name="signature.asc"\r
 192 Content-Description: Digital signature\r
 193 \r
 194 -----BEGIN PGP SIGNATURE-----\r
 195 Version: GnuPG v1.4.12 (GNU/Linux)\r
 196 \r
 197 iQEcBAEBCAAGBQJRHX1/AAoJELaxzZYTaZ+4hN0H/24VkdDDfzyS90jDQQOcRg2j\r
 198 XfQ0jqx3vEFZxqp9RF9ISSc519wttNyNLvhFE6gppuFWj4d4VGhupwP+YMzYQD7z\r
 199 a+FQH2WNasiFzj1llNZ53GHwGarSIqWZYK565dAgedBfKQzil0Px9F2EhwuunkvZ\r
 200 CsW6aZePfEDZQYqKlf2nZT+GW3uR+c142TgNu6s0MLW+zxf7ALQmtJgv42G1kYAS\r
 201 YF+EcVfMPW+TfKG+XpKaqhTQoUa37jAj5bnuTAaNf9PI4Ci80y/VVKoFkRwL55HC\r
 202 1iLdl4fI7qQTWzTzFKdyAaLLQYq2SG9/VJgBAq+qqkF3ICpFcZBYGTsrlMl+dCw=\r
 203 =+1EW\r
 204 -----END PGP SIGNATURE-----\r
 205 \r
 206 --NMuMz9nt05w80d4+--\r