[PATCH v3] contrib: pick: bugfix when trying to show a non-message

diff --git a/41/f4c67d3e212787930451c247cd9e0c16afa6d5 b/41/f4c67d3e212787930451c247cd9e0c16afa6d5
new file mode 100644 (file)
index 0000000..08c5f56
--- /dev/null
+++ b/41/f4c67d3e212787930451c247cd9e0c16afa6d5
@@ -0,0 +1,95 @@
+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 1CF97431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 10 Nov 2012 09:02:21 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.7\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.7 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
+       FREEMAIL_REPLY=2.499, 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 seGkCylElSPg for <notmuch@notmuchmail.org>;\r
+       Sat, 10 Nov 2012 09:02:20 -0800 (PST)\r
+Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 830AB431FAF   for <notmuch@notmuchmail.org>; Sat, 10 Nov 2012 09:02:20 -0800\r
+ (PST)\r
+Received: by mail-wg0-f45.google.com with SMTP id dq12so2695379wgb.2\r
+       for <notmuch@notmuchmail.org>; Sat, 10 Nov 2012 09:02:19 -0800 (PST)\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:x-mailer;\r
+       bh=7A/lHek2vsIdmV1nspVjYl+xcftSvsTarNacOd/HEAg=;\r
+       b=tV4b25m9ngk4Wx+Qu4xEe/GU6jusd+nRbybYqFdozfrcIgf34Iw5zp2gBYom13ViYP\r
+       4s6m3Od8DFNDwjc9hwJNBLbQlNRIeg4pxluZN23C7N1aSC1P8h29MTQs7gcyyK4KYdKK\r
+       fVGIb8a8l4H3oDi3WctAe8E389eG8wEupzvHv6FRyXDG4JLiiPjLBjR9cI2uq2F+GqYP\r
+       O+M9FUyWI0gGmXlNJGc4zZQQztOA5htRhlJqCUYgmxshea/sgfW6VQmWtjwtOggUpZDa\r
+       UONnB46/pZpU5/F2p+kHFFWKb67dJKWRFUPDpojZxB4wzfcYzVruAJ6+T9Y51U4VRyXK\r
+       ulDQ==\r
+Received: by 10.180.84.101 with SMTP id x5mr4883283wiy.18.1352566939273;\r
+       Sat, 10 Nov 2012 09:02:19 -0800 (PST)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPS id ey2sm3116666wib.9.2012.11.10.09.02.17\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 10 Nov 2012 09:02:18 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3] contrib: pick: bugfix when trying to show a non-message\r
+Date: Sat, 10 Nov 2012 17:02:18 +0000\r
+Message-Id: <1352566938-12473-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: Sat, 10 Nov 2012 17:02:21 -0000\r
+\r
+If the user pressed return on the end result status line it gave a\r
+blank message. Modify the function notmuch-pick-get-message-id to\r
+return nil rather than an empty message-id in this case to fix this.\r
+\r
+This also fixes a bug in the (lack of) quoting of the id string.\r
+---\r
+\r
+v2 is at id:1352562350-8219-1-git-send-email-markwalters1009@gmail.com\r
+\r
+As suggested by bremner make the nil return from the if clause\r
+explicit (as that is the point of the change).\r
+\r
+\r
+ contrib/notmuch-pick/notmuch-pick.el |    5 ++++-\r
+ 1 files changed, 4 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 15ac5e8..4db9632 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -241,7 +241,10 @@ Some useful entries are:\r
+ \r
+ (defun notmuch-pick-get-message-id ()\r
+   "Return the message id of the current message."\r
+-  (concat "id:\"" (notmuch-pick-get-prop :id) "\""))\r
++  (let ((id (notmuch-pick-get-prop :id)))\r
++    (if id\r
++      (notmuch-id-to-query id)\r
++      nil)))\r
+ \r
+ (defun notmuch-pick-get-match ()\r
+   "Return whether the current message is a match."\r
+-- \r
+1.7.9.1\r
+\r