Re: [PATCH] emacs: stash bugfix

diff --git a/93/4c6bc28b54390a566307bea67391f75f342309 b/93/4c6bc28b54390a566307bea67391f75f342309
new file mode 100644 (file)
index 0000000..2149ac4
--- /dev/null
+++ b/93/4c6bc28b54390a566307bea67391f75f342309
@@ -0,0 +1,120 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 AC738431FB6\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Dec 2012 01:28:02 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 kTOv39+p1ytV for <notmuch@notmuchmail.org>;\r
+       Mon,  3 Dec 2012 01:28:02 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id BF016431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Dec 2012 01:28:01 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1TfSJe-0005uU-W7; Mon, 03 Dec 2012 09:27:55 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1TfSJe-0006HL-Jd; Mon, 03 Dec 2012 09:27:54 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>\r
+Subject: Re: [PATCH] emacs: stash bugfix\r
+In-Reply-To: <20121203013402.GC1020@mit.edu>\r
+References: <1354443068-5030-1-git-send-email-markwalters1009@gmail.com>\r
+       <20121203013402.GC1020@mit.edu>\r
+User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 03 Dec 2012 09:27:57 +0000\r
+Message-ID: <87ehj71o4i.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: c8fefd036ec0434acef57d560fb3d19d (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.7\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.7 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.6 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+Cc: notmuch@notmuchmail.org\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: Mon, 03 Dec 2012 09:28:02 -0000\r
+\r
+\r
+On Mon, 03 Dec 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> Quoth Mark Walters on Dec 02 at 10:11 am:\r
+>> Currently an attempt to stash a non-existent field (eg cc when not\r
+>> present) throws an error. Catch this case and give the user a warning\r
+>> message.\r
+>> \r
+>> ---\r
+>> While messing around with notmuch-pick key bindings I found the\r
+>> following bug. The easiest way I have found to trigger it is cc\r
+>> (stash-cc) in show mode on a message with no cc header.\r
+>> \r
+>> Best wishes\r
+>> \r
+>> Mark\r
+>> \r
+>>  emacs/notmuch-lib.el |    7 +++++--\r
+>>  1 files changed, 5 insertions(+), 2 deletions(-)\r
+>> \r
+>> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+>> index 1d0ec17..c7d8e02 100644\r
+>> --- a/emacs/notmuch-lib.el\r
+>> +++ b/emacs/notmuch-lib.el\r
+>> @@ -183,8 +183,11 @@ user-friendly queries."\r
+>>  \r
+>>  (defun notmuch-common-do-stash (text)\r
+>>    "Common function to stash text in kill ring, and display in minibuffer."\r
+>> -  (kill-new text)\r
+>> -  (message "Stashed: %s" text))\r
+>> +  (if text\r
+>> +      (progn\r
+>> +   (kill-new text)\r
+>> +   (message "Stashed: %s" text))\r
+>> +    (message "Warning: Nothing to stash!")))\r
+>\r
+> Without the unnecessary "Warning:" bit of the message, LGTM.\r
+\r
+I am obviously happy to remove the "warning": however do you think\r
+stashing a non-existent thing should empty the kill-ring? I am a little\r
+worried about someone stashing something, not noticing the "nothing to\r
+stash" and then pasting some random thing somewhere (eg something\r
+private into irc).\r
+\r
+Best wishes\r
+\r
+Mark\r