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 CC6B8431FB6
\r
6 for <notmuch@notmuchmail.org>; Wed, 5 Dec 2012 04:21:03 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 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 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 z5bhWemH7e1m for <notmuch@notmuchmail.org>;
\r
18 Wed, 5 Dec 2012 04:21:03 -0800 (PST)
\r
19 Received: from mail-we0-f181.google.com (mail-we0-f181.google.com
\r
20 [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id 40EA6431FAE
\r
23 for <notmuch@notmuchmail.org>; Wed, 5 Dec 2012 04:21:03 -0800 (PST)
\r
24 Received: by mail-we0-f181.google.com with SMTP id t11so2420926wey.26
\r
25 for <notmuch@notmuchmail.org>; Wed, 05 Dec 2012 04:21:02 -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:in-reply-to:references;
\r
28 bh=PcigKZ42vJY/21M838jqdFbDFDn0yz86MNUYB3m9tvA=;
\r
29 b=j8xNiFGl4EUo+nHhjgPtb/Eos7yE+QIBsRF75ko+FHLGBNGGOxYrGVEdtm6iqt+Y3N
\r
30 yDRj5KT8wulu3BnLkhwO08bjZ0lW9jOgOgTxHHttONcZYWKzqeQfWfmpMv50n7Vt5Oos
\r
31 ltlTTzR4nShfUaNnz6O2G2oLyI+qnXialSpcUH2X7FT5WbCl+B6MVOaa15PgEK6PdZp7
\r
32 ndpU4rgsvk6EmCuFfcFpReRi/8OWj6GAF1n9czOul+JqA7pb3JYPSv+njZKCVmv9M4V5
\r
33 ZDWuwyVFdPNKDx423Qck1GeXIqLZtq/CdQj7Q3imfDvaj1EFN4a99uat1YNmFaXmggGc
\r
35 Received: by 10.180.85.194 with SMTP id j2mr2860308wiz.12.1354710062152;
\r
36 Wed, 05 Dec 2012 04:21:02 -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 p2sm6170537wic.7.2012.12.05.04.21.00
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Wed, 05 Dec 2012 04:21:01 -0800 (PST)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v2] emacs: stash bugfix
\r
44 Date: Wed, 5 Dec 2012 12:20:54 +0000
\r
45 Message-Id: <1354710054-23093-1-git-send-email-markwalters1009@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.9.1
\r
47 In-Reply-To: <20121203152015.GD1020@mit.edu>
\r
48 References: <20121203152015.GD1020@mit.edu>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Wed, 05 Dec 2012 12:21:03 -0000
\r
63 Currently an attempt to stash a non-existent field (eg cc when not
\r
64 present) throws an error. Catch this case and give the user a warning
\r
68 This fixes the comment and stashes an empty string in the
\r
69 case there is nothing to stash (both suggested by Austin).
\r
72 emacs/notmuch-lib.el | 10 ++++++++--
\r
73 1 files changed, 8 insertions(+), 2 deletions(-)
\r
75 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
76 index 1d0ec17..5c44867 100644
\r
77 --- a/emacs/notmuch-lib.el
\r
78 +++ b/emacs/notmuch-lib.el
\r
79 @@ -183,8 +183,14 @@ user-friendly queries."
\r
81 (defun notmuch-common-do-stash (text)
\r
82 "Common function to stash text in kill ring, and display in minibuffer."
\r
84 - (message "Stashed: %s" text))
\r
88 + (message "Stashed: %s" text))
\r
89 + ;; There is nothing to stash so stash an empty string so the user
\r
90 + ;; doesn't accidentally paste something else somewhere.
\r
92 + (message "Nothing to stash!")))
\r