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

diff --git a/14/927109279a54b086af7e1c48993f89179b0da1 b/14/927109279a54b086af7e1c48993f89179b0da1
new file mode 100644 (file)
index 0000000..2dcc151
--- /dev/null
+++ b/14/927109279a54b086af7e1c48993f89179b0da1
@@ -0,0 +1,85 @@
+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 C8A04431FBC\r
+       for <notmuch@notmuchmail.org>; Thu,  1 Nov 2012 12:26:28 -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 qwl9iSN3qh6J for <notmuch@notmuchmail.org>;\r
+       Thu,  1 Nov 2012 12:26:28 -0700 (PDT)\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
+ 4AE1C431FAE   for <notmuch@notmuchmail.org>; Thu,  1 Nov 2012 12:26:28 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f45.google.com with SMTP id dq12so1608411wgb.2\r
+       for <notmuch@notmuchmail.org>; Thu, 01 Nov 2012 12:26:27 -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:x-mailer;\r
+       bh=S72DjZVV8OqlGfDBIIohPxBbPxn//Vib74eMLrD1KMs=;\r
+       b=jso4LBqSs86tGvzuzlBDHtMfq67eg+3zdcbsaE27ltrjaI3WBWBMio3R79zXFwNhyX\r
+       OscL/+3LAbXPTDXBmRQLg2JAffH+3dmnT3N2SFgDuk73Ne+0yV/gqnsdHlxioKAFE+Wn\r
+       5t9+f5WN+sTP+2RPCtv67r4CV0eFIo21Ft+pCsNRDJRYpBWLCXwy43iZtyPzQ6MlXtuX\r
+       wPuoNS7L0zS1N7riugIJsLDL2ge2xU2oz9RNl/e1VjHLicm4TWYBOQwCKHQ99QOj6YVg\r
+       jedhyzt2PBVZwqJx9O8Pc394FUSgbjNsQy31j9BKpXZoHj2bvJ3MA0yOpEDVhQmIOVjB\r
+       FA7w==\r
+Received: by 10.180.99.99 with SMTP id ep3mr3312303wib.15.1351797987059;\r
+       Thu, 01 Nov 2012 12:26:27 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPS id m14sm117878wie.8.2012.11.01.12.26.25\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Thu, 01 Nov 2012 12:26:26 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] contrib: pick: bugfix when trying to show a non-message\r
+Date: Thu,  1 Nov 2012 19:26:23 +0000\r
+Message-Id: <1351797983-19707-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: Thu, 01 Nov 2012 19:26:28 -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
+ contrib/notmuch-pick/notmuch-pick.el |    4 +++-\r
+ 1 files changed, 3 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 15ac5e8..1886469 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -241,7 +241,9 @@ 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
++    (when id\r
++      (concat "id:\"" id "\""))))\r
+ \r
+ (defun notmuch-pick-get-match ()\r
+   "Return whether the current message is a match."\r
+-- \r
+1.7.9.1\r
+\r