Return-Path: <zack@upsilon.cc>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id C1D5A431FC0
	for <notmuch@notmuchmail.org>; Tue,  3 Jul 2012 14:31:09 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: 0
X-Spam-Level: 
X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
	autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id V6AsVb5l3KKq for <notmuch@notmuchmail.org>;
	Tue,  3 Jul 2012 14:31:08 -0700 (PDT)
Received: from upsilon.hackadomia.org (upsilon.hackadomia.org
 [91.121.245.170])	by olra.theworths.org (Postfix) with ESMTP id E5ED7431FB6
	for <notmuch@notmuchmail.org>; Tue,  3 Jul 2012 14:31:05 -0700 (PDT)
Received: from usha.takhisis.invalid (unknown
	[IPv6:2001:470:5:b71:f2de:f1ff:fed1:eff6])
	by upsilon.hackadomia.org (Postfix) with ESMTPSA id F1A50100DE;
	Tue,  3 Jul 2012 23:31:04 +0200 (CEST)
Received: by usha.takhisis.invalid (Postfix, from userid 1000)
	id 32AE96811BB; Tue,  3 Jul 2012 23:31:03 +0200 (CEST)
From: Stefano Zacchiroli <zack@upsilon.cc>
To: notmuch@notmuchmail.org, 678012@bugs.debian.org,
	Salvatore Bonaccorso <carnil@debian.org>
Subject: [PATCH 1/2] notmuch-mutt: fix helper invocation for the tag action
Date: Tue,  3 Jul 2012 15:30:47 -0600
Message-Id: <1341351048-28024-2-git-send-email-zack@upsilon.cc>
X-Mailer: git-send-email 1.7.10
In-Reply-To: <1341351048-28024-1-git-send-email-zack@upsilon.cc>
References: <20120618161731.1216.77946.reportbug@elende.valinor.li>
	<1341351048-28024-1-git-send-email-zack@upsilon.cc>
Cc: Stefano Zacchiroli <zack@upsilon.cc>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jul 2012 21:31:10 -0000

As it was before, "-inbox" was interpreted as a getopt option, rather
than as a tag manipulation request. Making the action unusable.

Closes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678012
---
 contrib/notmuch-mutt/notmuch-mutt    |    2 +-
 contrib/notmuch-mutt/notmuch-mutt.rc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmuch-mutt
index fee165d..7c125e6 100755
--- a/contrib/notmuch-mutt/notmuch-mutt
+++ b/contrib/notmuch-mutt/notmuch-mutt
@@ -211,7 +211,7 @@ F</etc/Muttrc>, or a configuration snippet under F</etc/Muttrc.d/>):
           "<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>" \
           "notmuch: reconstruct thread"
     macro index <F6> \
-          "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag -inbox<enter>" \
+          "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag -- -inbox<enter>" \
           "notmuch: remove message from inbox"
 
 The first macro (activated by <F8>) prompts the user for notmuch search terms
diff --git a/contrib/notmuch-mutt/notmuch-mutt.rc b/contrib/notmuch-mutt/notmuch-mutt.rc
index c0ff000..b0a38d1 100644
--- a/contrib/notmuch-mutt/notmuch-mutt.rc
+++ b/contrib/notmuch-mutt/notmuch-mutt.rc
@@ -5,5 +5,5 @@ macro index <F9> \
       "<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>" \
       "notmuch: reconstruct thread"
 macro index <F6> \
-      "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag -inbox<enter>" \
+      "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag -- -inbox<enter>" \
       "notmuch: remove message from inbox"
-- 
1.7.10