From: Mark Walters Date: Sat, 10 Nov 2012 15:45:50 +0000 (+0000) Subject: [PATCH v2] contrib: pick: bugfix when trying to show a non-message X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f72c8d792eef53cccf563e0226e1cbdd329d7971;p=notmuch-archives.git [PATCH v2] contrib: pick: bugfix when trying to show a non-message --- diff --git a/7b/42256d30f3da77ea846cd6f622b283e084ad02 b/7b/42256d30f3da77ea846cd6f622b283e084ad02 new file mode 100644 index 000000000..7e537eea8 --- /dev/null +++ b/7b/42256d30f3da77ea846cd6f622b283e084ad02 @@ -0,0 +1,98 @@ +Return-Path: +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 B5CC7431FB6 + for ; Sat, 10 Nov 2012 07:45:56 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.7 +X-Spam-Level: ** +X-Spam-Status: No, score=2.7 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + FREEMAIL_REPLY=2.499, RCVD_IN_DNSWL_LOW=-0.7] 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 PVJ83dmwY9g0 for ; + Sat, 10 Nov 2012 07:45:56 -0800 (PST) +Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com + [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 27070431FAF for ; Sat, 10 Nov 2012 07:45:56 -0800 + (PST) +Received: by mail-wg0-f45.google.com with SMTP id dq12so2670600wgb.2 + for ; Sat, 10 Nov 2012 07:45:54 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer; + bh=oBU6P/gGmysGtvnjbgtkEp2rEFzM9E2NDJYblO1ZzHE=; + b=xU1GVcO42+plbAsG1YD0PzVU+6H5cqAWcI71wwwjx1JCgXeQsE/zChOKdW9mvmMBpt + eybp7Tbms3H/qvx9QG2RD4naYnbvre2IbYrKnl1OnJ7f9XfQA5BjgNoWVt3d3rK66KrX + G3RsLV5egntmygVE4+TjbXsn5tf8zAifL8OsF1VHYF+EcssylDaEvWEbjQ9nvCjqFVAT + 7LW8sLlSOyXJJW0m6eql3OYjT8DDwSj/H/ESbMUcl5hC+n3M8fwIFE/dFwlLcXVOTC0v + +HZ2WvQJs73v481J72n4uLLh1kNXhd+YNhnubst1K1XwJMXSZTNsVp4K1gdn0zwh9+yy + AW8w== +Received: by 10.216.201.28 with SMTP id a28mr6270329weo.74.1352562353333; + Sat, 10 Nov 2012 07:45:53 -0800 (PST) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPS id bn7sm2795634wib.8.2012.11.10.07.45.51 + (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 10 Nov 2012 07:45:52 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v2] contrib: pick: bugfix when trying to show a non-message +Date: Sat, 10 Nov 2012 15:45:50 +0000 +Message-Id: <1352562350-8219-1-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 10 Nov 2012 15:45:56 -0000 + +If the user pressed return on the end result status line it gave a +blank message. Modify the function notmuch-pick-get-message-id to +return nil rather than an empty message-id in this case to fix this. + +This also fixes a bug in the (lack of) quoting of the id string. +--- + +Version 1 is at +id:1351797983-19707-1-git-send-email-markwalters1009@gmail.com + +This version changes the `when' to and `if' and adds the fix for the +quoting. + +Best wishes + +Mark + + contrib/notmuch-pick/notmuch-pick.el | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el +index 15ac5e8..bbfa6fb 100644 +--- a/contrib/notmuch-pick/notmuch-pick.el ++++ b/contrib/notmuch-pick/notmuch-pick.el +@@ -241,7 +241,9 @@ Some useful entries are: + + (defun notmuch-pick-get-message-id () + "Return the message id of the current message." +- (concat "id:\"" (notmuch-pick-get-prop :id) "\"")) ++ (let ((id (notmuch-pick-get-prop :id))) ++ (if id ++ (notmuch-id-to-query id)))) + + (defun notmuch-pick-get-match () + "Return whether the current message is a match." +-- +1.7.9.1 +