1 Return-Path: <markwalters1009@gmail.com>
\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 1CF97431FB6
\r
6 for <notmuch@notmuchmail.org>; Sat, 10 Nov 2012 09:02:21 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=2.7 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 FREEMAIL_REPLY=2.499, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id seGkCylElSPg for <notmuch@notmuchmail.org>;
\r
18 Sat, 10 Nov 2012 09:02:20 -0800 (PST)
\r
19 Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com
\r
20 [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
21 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
22 830AB431FAF for <notmuch@notmuchmail.org>; Sat, 10 Nov 2012 09:02:20 -0800
\r
24 Received: by mail-wg0-f45.google.com with SMTP id dq12so2695379wgb.2
\r
25 for <notmuch@notmuchmail.org>; Sat, 10 Nov 2012 09:02:19 -0800 (PST)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:x-mailer;
\r
28 bh=7A/lHek2vsIdmV1nspVjYl+xcftSvsTarNacOd/HEAg=;
\r
29 b=tV4b25m9ngk4Wx+Qu4xEe/GU6jusd+nRbybYqFdozfrcIgf34Iw5zp2gBYom13ViYP
\r
30 4s6m3Od8DFNDwjc9hwJNBLbQlNRIeg4pxluZN23C7N1aSC1P8h29MTQs7gcyyK4KYdKK
\r
31 fVGIb8a8l4H3oDi3WctAe8E389eG8wEupzvHv6FRyXDG4JLiiPjLBjR9cI2uq2F+GqYP
\r
32 O+M9FUyWI0gGmXlNJGc4zZQQztOA5htRhlJqCUYgmxshea/sgfW6VQmWtjwtOggUpZDa
\r
33 UONnB46/pZpU5/F2p+kHFFWKb67dJKWRFUPDpojZxB4wzfcYzVruAJ6+T9Y51U4VRyXK
\r
35 Received: by 10.180.84.101 with SMTP id x5mr4883283wiy.18.1352566939273;
\r
36 Sat, 10 Nov 2012 09:02:19 -0800 (PST)
\r
37 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])
\r
38 by mx.google.com with ESMTPS id ey2sm3116666wib.9.2012.11.10.09.02.17
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Sat, 10 Nov 2012 09:02:18 -0800 (PST)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v3] contrib: pick: bugfix when trying to show a non-message
\r
44 Date: Sat, 10 Nov 2012 17:02:18 +0000
\r
45 Message-Id: <1352566938-12473-1-git-send-email-markwalters1009@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.9.1
\r
47 X-BeenThere: notmuch@notmuchmail.org
\r
48 X-Mailman-Version: 2.1.13
\r
50 List-Id: "Use and development of the notmuch mail system."
\r
51 <notmuch.notmuchmail.org>
\r
52 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
54 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
55 List-Post: <mailto:notmuch@notmuchmail.org>
\r
56 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
57 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
58 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
59 X-List-Received-Date: Sat, 10 Nov 2012 17:02:21 -0000
\r
61 If the user pressed return on the end result status line it gave a
\r
62 blank message. Modify the function notmuch-pick-get-message-id to
\r
63 return nil rather than an empty message-id in this case to fix this.
\r
65 This also fixes a bug in the (lack of) quoting of the id string.
\r
68 v2 is at id:1352562350-8219-1-git-send-email-markwalters1009@gmail.com
\r
70 As suggested by bremner make the nil return from the if clause
\r
71 explicit (as that is the point of the change).
\r
74 contrib/notmuch-pick/notmuch-pick.el | 5 ++++-
\r
75 1 files changed, 4 insertions(+), 1 deletions(-)
\r
77 diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
\r
78 index 15ac5e8..4db9632 100644
\r
79 --- a/contrib/notmuch-pick/notmuch-pick.el
\r
80 +++ b/contrib/notmuch-pick/notmuch-pick.el
\r
81 @@ -241,7 +241,10 @@ Some useful entries are:
\r
83 (defun notmuch-pick-get-message-id ()
\r
84 "Return the message id of the current message."
\r
85 - (concat "id:\"" (notmuch-pick-get-prop :id) "\""))
\r
86 + (let ((id (notmuch-pick-get-prop :id)))
\r
88 + (notmuch-id-to-query id)
\r
91 (defun notmuch-pick-get-match ()
\r
92 "Return whether the current message is a match."
\r