Re: [PATCH] emacs: stash bugfix

diff --git a/50/3dc7152ada75c80b9672cb545dec89d92c4fa3 b/50/3dc7152ada75c80b9672cb545dec89d92c4fa3
new file mode 100644 (file)
index 0000000..9643dbd
--- /dev/null
+++ b/50/3dc7152ada75c80b9672cb545dec89d92c4fa3
@@ -0,0 +1,99 @@
+Return-Path: <tomi.ollila@iki.fi>\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 D4058431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  2 Dec 2012 03:04:18 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 yjcOI85dVBND for <notmuch@notmuchmail.org>;\r
+       Sun,  2 Dec 2012 03:04:14 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 965E8431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  2 Dec 2012 03:04:14 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 423F4100045;\r
+       Sun,  2 Dec 2012 13:04:10 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: stash bugfix\r
+In-Reply-To: <1354443068-5030-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1354443068-5030-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.14+116~g29fcdb5 (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 02 Dec 2012 13:04:09 +0200\r
+Message-ID: <m2boecsok6.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sun, 02 Dec 2012 11:04:19 -0000\r
+\r
+On Sun, Dec 02 2012, Mark Walters <markwalters1009@gmail.com> wrote:\r
+\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
+\r
+LGTM.\r
+\r
+Tomi\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
+>  ;;\r
+>  \r
+> -- \r
+> 1.7.9.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r