Re: [PATCH] emacs: stash bugfix

diff --git a/5f/b21d3857ff10c63be792e0cb6b15699ea92e73 b/5f/b21d3857ff10c63be792e0cb6b15699ea92e73
new file mode 100644 (file)
index 0000000..05d596b
--- /dev/null
+++ b/5f/b21d3857ff10c63be792e0cb6b15699ea92e73
@@ -0,0 +1,110 @@
+Return-Path: <amdragon@mit.edu>\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 D18F6431FB6\r
+       for <notmuch@notmuchmail.org>; Sun,  2 Dec 2012 17:34:06 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 heKTOQphOUnA for <notmuch@notmuchmail.org>;\r
+       Sun,  2 Dec 2012 17:34:06 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
+       [18.9.25.12])\r
+       by olra.theworths.org (Postfix) with ESMTP id E1BD4431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  2 Dec 2012 17:34:05 -0800 (PST)\r
+X-AuditID: 1209190c-b7f886d000000936-36-50bc018c9af6\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 5B.A6.02358.C810CB05; Sun,  2 Dec 2012 20:34:04 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qB31Y4pK016383; \r
+       Sun, 2 Dec 2012 20:34:04 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qB31Y2cC015358\r
+       (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+       Sun, 2 Dec 2012 20:34:03 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1TfKv4-0006dd-EH; Sun, 02 Dec 2012 20:34:02 -0500\r
+Date: Sun, 2 Dec 2012 20:34:02 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Mark Walters <markwalters1009@gmail.com>\r
+Subject: Re: [PATCH] emacs: stash bugfix\r
+Message-ID: <20121203013402.GC1020@mit.edu>\r
+References: <1354443068-5030-1-git-send-email-markwalters1009@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1354443068-5030-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpileLIzCtJLcpLzFFi42IRYrdT0e1h3BNgsHSDtcXquTwW12/OZHZg\r
+       8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4Mt5P3s9U8ICjYvauRSwNjK/Zuhg5OSQETCTa\r
+       tp5hh7DFJC7cWw8U5+IQEtjHKLFn4lQWCGc9o8StB39ZIZwLTBILJ2+GyixhlPg8+yCQw8HB\r
+       IqAisbNRCWQUm4CGxLb9yxlBbBEBHYnbhxaArWAWkJb49ruZCcQWBqo5fukG2Bm8AtoSU7es\r
+       BosLCXhIdG05wA4RF5Q4OfMJC0SvlsSNfy+ZQFaBzFn+jwMkzCngKXHnXBtYqyjQBVNObmOb\r
+       wCg0C0n3LCTdsxC6FzAyr2KUTcmt0s1NzMwpTk3WLU5OzMtLLdI11MvNLNFLTSndxAgKak5J\r
+       nh2Mbw4qHWIU4GBU4uF98GV3gBBrYllxZe4hRkkOJiVRXrP/QCG+pPyUyozE4oz4otKc1OJD\r
+       jBIczEoivIsrgHK8KYmVValF+TApaQ4WJXHeyyk3/YUE0hNLUrNTUwtSi2CyMhwcShK8eQx7\r
+       AoQEi1LTUyvSMnNKENJMHJwgw3mAhrMCk4AQb3FBYm5xZjpE/hSjopQ470yQZgGQREZpHlwv\r
+       LOm8YhQHekWYdy9IFQ8wYcF1vwIazAQ0+IUQyNXFJYkIKakGRr2Cs/N6Q39FSHy1Wylxye3j\r
+       X910zj8vXHRT1+6TNmPfq5J8jcfw0OfIGULbypY+bi1sEHj1Sypt54u65Dti9vU2vHHh+mtT\r
+       Na5KFa3yMD16RjEkXT1v96esd1UfV87f9Vs35+CaqJp5jPxOR+sb7Sdnzc++GtMyK6Anzc6C\r
+       2TLw1wHHvZdXKrEUZyQaajEXFScCAOUkencVAwAA\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 01:34:07 -0000\r
+\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