[PATCH] contrib: pick: bugfix use of mini-buffer history

diff --git a/e7/669d70b196ca8b97be3a59615ef19189bfedb8 b/e7/669d70b196ca8b97be3a59615ef19189bfedb8
new file mode 100644 (file)
index 0000000..0bd57bf
--- /dev/null
+++ b/e7/669d70b196ca8b97be3a59615ef19189bfedb8
@@ -0,0 +1,84 @@
+Return-Path: <markwalters1009@gmail.com>\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 CDD28431FAF\r
+       for <notmuch@notmuchmail.org>; Sun, 15 Sep 2013 01:19:42 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] 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 HZIz7kSDdJGz for <notmuch@notmuchmail.org>;\r
+       Sun, 15 Sep 2013 01:19:37 -0700 (PDT)\r
+Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com\r
+ [74.125.82.46])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 2ECF8431FAE   for <notmuch@notmuchmail.org>; Sun, 15 Sep 2013 01:19:37 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f46.google.com with SMTP id k14so2509132wgh.13\r
+       for <notmuch@notmuchmail.org>; Sun, 15 Sep 2013 01:19:36 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id;\r
+       bh=OL42/qebErswpTzsRD37fppqbw/0qCpamT2vMeXCXGI=;\r
+       b=fpCPwbX8cp8+rBmGhP4uob1NkGQxpURbxHD3FdA0d4CSTr++3YaL2oAoBxmmWKSyR/\r
+       oSuAgIgBe0NbbzB/bdmTfpNpDG3S0rQ67T1w8BaoSJcIlLF4VbTikteu/iNy1Ma+dzan\r
+       pNRKQXk7dsbN7HwSuYpWMyj3jqTVgInsDk6RAJMmwdJc6aMGireFKCk8Hz/QdZlQ7k/C\r
+       uu11L7PAT+wdTpbhUuJqC2gzgEJWSm0RHctUkkF5WQ5iBberxGbe+BILIeIlclumdqdg\r
+       E+fH2U1UgkMVHkf2AAsqAsgvhPbioUvT7oe+uzniOlFmv+43wf7pry8/ICCYEgUjAw5J\r
+       mpcg==\r
+X-Received: by 10.180.189.205 with SMTP id gk13mr8898349wic.12.1379233176136; \r
+       Sun, 15 Sep 2013 01:19:36 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id b13sm14879456wic.9.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 15 Sep 2013 01:19:35 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] contrib: pick: bugfix use of mini-buffer history\r
+Date: Sun, 15 Sep 2013 09:19:33 +0100\r
+Message-Id: <1379233173-9812-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\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: Sun, 15 Sep 2013 08:19:42 -0000\r
+\r
+pick was meant to use the same mini-buffer history but this failed\r
+because the interactive definition took place before the use search\r
+mini-buffer history part. Remove the interactive prompt to ensure the\r
+correct history is used.\r
+---\r
+ contrib/notmuch-pick/notmuch-pick.el |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 01ca4bd..ad85d03 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -948,7 +948,7 @@ The arguments are:\r
+   BUFFER-NAME: the name of the buffer to show the pick tree. If\r
+       it is nil \"*notmuch-pick\" followed by QUERY is used.\r
+   OPEN-TARGET: If TRUE open the target message in the message pane."\r
+-  (interactive "sNotmuch pick: ")\r
++  (interactive)\r
+   (if (null query)\r
+       (setq query (notmuch-read-query "Notmuch pick: ")))\r
+   (let ((buffer (get-buffer-create (generate-new-buffer-name\r
+-- \r
+1.7.9.1\r
+\r