[PATCH 1/2] notmuch-mutt: fix helper invocation for the tag action

diff --git a/76/5e529c680fc49238ea743d6004a82ca537db30 b/76/5e529c680fc49238ea743d6004a82ca537db30
new file mode 100644 (file)
index 0000000..7b25172
--- /dev/null
+++ b/76/5e529c680fc49238ea743d6004a82ca537db30
@@ -0,0 +1,86 @@
+Return-Path: <zack@upsilon.cc>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id C1D5A431FC0\r
+       for <notmuch@notmuchmail.org>; Tue,  3 Jul 2012 14:31:09 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id V6AsVb5l3KKq for <notmuch@notmuchmail.org>;\r
+       Tue,  3 Jul 2012 14:31:08 -0700 (PDT)\r
+Received: from upsilon.hackadomia.org (upsilon.hackadomia.org\r
+ [91.121.245.170])     by olra.theworths.org (Postfix) with ESMTP id E5ED7431FB6\r
+       for <notmuch@notmuchmail.org>; Tue,  3 Jul 2012 14:31:05 -0700 (PDT)\r
+Received: from usha.takhisis.invalid (unknown\r
+       [IPv6:2001:470:5:b71:f2de:f1ff:fed1:eff6])\r
+       by upsilon.hackadomia.org (Postfix) with ESMTPSA id F1A50100DE;\r
+       Tue,  3 Jul 2012 23:31:04 +0200 (CEST)\r
+Received: by usha.takhisis.invalid (Postfix, from userid 1000)\r
+       id 32AE96811BB; Tue,  3 Jul 2012 23:31:03 +0200 (CEST)\r
+From: Stefano Zacchiroli <zack@upsilon.cc>\r
+To: notmuch@notmuchmail.org, 678012@bugs.debian.org,\r
+       Salvatore Bonaccorso <carnil@debian.org>\r
+Subject: [PATCH 1/2] notmuch-mutt: fix helper invocation for the tag action\r
+Date: Tue,  3 Jul 2012 15:30:47 -0600\r
+Message-Id: <1341351048-28024-2-git-send-email-zack@upsilon.cc>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1341351048-28024-1-git-send-email-zack@upsilon.cc>\r
+References: <20120618161731.1216.77946.reportbug@elende.valinor.li>\r
+       <1341351048-28024-1-git-send-email-zack@upsilon.cc>\r
+Cc: Stefano Zacchiroli <zack@upsilon.cc>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 03 Jul 2012 21:31:10 -0000\r
+\r
+As it was before, "-inbox" was interpreted as a getopt option, rather\r
+than as a tag manipulation request. Making the action unusable.\r
+\r
+Closes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678012\r
+---\r
+ contrib/notmuch-mutt/notmuch-mutt    |    2 +-\r
+ contrib/notmuch-mutt/notmuch-mutt.rc |    2 +-\r
+ 2 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmuch-mutt\r
+index fee165d..7c125e6 100755\r
+--- a/contrib/notmuch-mutt/notmuch-mutt\r
++++ b/contrib/notmuch-mutt/notmuch-mutt\r
+@@ -211,7 +211,7 @@ F</etc/Muttrc>, or a configuration snippet under F</etc/Muttrc.d/>):\r
+           "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt thread<enter><change-folder-readonly>~/.cache/notmuch/mutt/results<enter><enter-command>set wait_key<enter>" \\r
+           "notmuch: reconstruct thread"\r
+     macro index <F6> \\r
+-          "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag -inbox<enter>" \\r
++          "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag -- -inbox<enter>" \\r
+           "notmuch: remove message from inbox"\r
+ \r
+ The first macro (activated by <F8>) prompts the user for notmuch search terms\r
+diff --git a/contrib/notmuch-mutt/notmuch-mutt.rc b/contrib/notmuch-mutt/notmuch-mutt.rc\r
+index c0ff000..b0a38d1 100644\r
+--- a/contrib/notmuch-mutt/notmuch-mutt.rc\r
++++ b/contrib/notmuch-mutt/notmuch-mutt.rc\r
+@@ -5,5 +5,5 @@ macro index <F9> \\r
+       "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt thread<enter><change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`<enter><enter-command>set wait_key<enter>" \\r
+       "notmuch: reconstruct thread"\r
+ macro index <F6> \\r
+-      "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag -inbox<enter>" \\r
++      "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag -- -inbox<enter>" \\r
+       "notmuch: remove message from inbox"\r
+-- \r
+1.7.10\r
+\r