76/5e529c680fc49238ea743d6004a82ca537db30

   1 Return-Path: <zack@upsilon.cc>\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 C1D5A431FC0\r
   6         for <notmuch@notmuchmail.org>; Tue,  3 Jul 2012 14:31:09 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
  12         autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id V6AsVb5l3KKq for <notmuch@notmuchmail.org>;\r
  16         Tue,  3 Jul 2012 14:31:08 -0700 (PDT)\r
  17 Received: from upsilon.hackadomia.org (upsilon.hackadomia.org\r
  18  [91.121.245.170])      by olra.theworths.org (Postfix) with ESMTP id E5ED7431FB6\r
  19         for <notmuch@notmuchmail.org>; Tue,  3 Jul 2012 14:31:05 -0700 (PDT)\r
  20 Received: from usha.takhisis.invalid (unknown\r
  21         [IPv6:2001:470:5:b71:f2de:f1ff:fed1:eff6])\r
  22         by upsilon.hackadomia.org (Postfix) with ESMTPSA id F1A50100DE;\r
  23         Tue,  3 Jul 2012 23:31:04 +0200 (CEST)\r
  24 Received: by usha.takhisis.invalid (Postfix, from userid 1000)\r
  25         id 32AE96811BB; Tue,  3 Jul 2012 23:31:03 +0200 (CEST)\r
  26 From: Stefano Zacchiroli <zack@upsilon.cc>\r
  27 To: notmuch@notmuchmail.org, 678012@bugs.debian.org,\r
  28         Salvatore Bonaccorso <carnil@debian.org>\r
  29 Subject: [PATCH 1/2] notmuch-mutt: fix helper invocation for the tag action\r
  30 Date: Tue,  3 Jul 2012 15:30:47 -0600\r
  31 Message-Id: <1341351048-28024-2-git-send-email-zack@upsilon.cc>\r
  32 X-Mailer: git-send-email 1.7.10\r
  33 In-Reply-To: <1341351048-28024-1-git-send-email-zack@upsilon.cc>\r
  34 References: <20120618161731.1216.77946.reportbug@elende.valinor.li>\r
  35         <1341351048-28024-1-git-send-email-zack@upsilon.cc>\r
  36 Cc: Stefano Zacchiroli <zack@upsilon.cc>\r
  37 X-BeenThere: notmuch@notmuchmail.org\r
  38 X-Mailman-Version: 2.1.13\r
  39 Precedence: list\r
  40 List-Id: "Use and development of the notmuch mail system."\r
  41         <notmuch.notmuchmail.org>\r
  42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  43         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  45 List-Post: <mailto:notmuch@notmuchmail.org>\r
  46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  48         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  49 X-List-Received-Date: Tue, 03 Jul 2012 21:31:10 -0000\r
  50 \r
  51 As it was before, "-inbox" was interpreted as a getopt option, rather\r
  52 than as a tag manipulation request. Making the action unusable.\r
  53 \r
  54 Closes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678012\r
  55 ---\r
  56  contrib/notmuch-mutt/notmuch-mutt    |    2 +-\r
  57  contrib/notmuch-mutt/notmuch-mutt.rc |    2 +-\r
  58  2 files changed, 2 insertions(+), 2 deletions(-)\r
  59 \r
  60 diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmuch-mutt\r
  61 index fee165d..7c125e6 100755\r
  62 --- a/contrib/notmuch-mutt/notmuch-mutt\r
  63 +++ b/contrib/notmuch-mutt/notmuch-mutt\r
  64 @@ -211,7 +211,7 @@ F</etc/Muttrc>, or a configuration snippet under F</etc/Muttrc.d/>):\r
  65            "<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
  66            "notmuch: reconstruct thread"\r
  67      macro index <F6> \\r
  68 -          "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag -inbox<enter>" \\r
  69 +          "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag -- -inbox<enter>" \\r
  70            "notmuch: remove message from inbox"\r
  71  \r
  72  The first macro (activated by <F8>) prompts the user for notmuch search terms\r
  73 diff --git a/contrib/notmuch-mutt/notmuch-mutt.rc b/contrib/notmuch-mutt/notmuch-mutt.rc\r
  74 index c0ff000..b0a38d1 100644\r
  75 --- a/contrib/notmuch-mutt/notmuch-mutt.rc\r
  76 +++ b/contrib/notmuch-mutt/notmuch-mutt.rc\r
  77 @@ -5,5 +5,5 @@ macro index <F9> \\r
  78        "<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
  79        "notmuch: reconstruct thread"\r
  80  macro index <F6> \\r
  81 -      "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag -inbox<enter>" \\r
  82 +      "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag -- -inbox<enter>" \\r
  83        "notmuch: remove message from inbox"\r
  84 -- \r
  85 1.7.10\r
  86 \r