Re: [PATCH v2] emacs: stash bugfix

diff --git a/07/99acb30ace0224fa59dfebf2343e6186111d91 b/07/99acb30ace0224fa59dfebf2343e6186111d91
new file mode 100644 (file)
index 0000000..0c8484d
--- /dev/null
+++ b/07/99acb30ace0224fa59dfebf2343e6186111d91
@@ -0,0 +1,119 @@
+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 4F8F6431FB6\r
+       for <notmuch@notmuchmail.org>; Wed,  5 Dec 2012 08:01:35 -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 6YZJK8xXO63M for <notmuch@notmuchmail.org>;\r
+       Wed,  5 Dec 2012 08:01:31 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7BCC4431FAE\r
+       for <notmuch@notmuchmail.org>; Wed,  5 Dec 2012 08:01:31 -0800 (PST)\r
+X-AuditID: 12074424-b7fe06d0000008f0-6b-50bf6fdb29b1\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 4B.5C.02288.BDF6FB05; Wed,  5 Dec 2012 11:01:31 -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 qB5G1Um6001379; \r
+       Wed, 5 Dec 2012 11:01:30 -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 qB5G1SQW004559\r
+       (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+       Wed, 5 Dec 2012 11:01:29 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1TgHPc-0007v9-D7; Wed, 05 Dec 2012 11:01:28 -0500\r
+From: Austin Clements <aclements@csail.mit.edu>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] emacs: stash bugfix\r
+In-Reply-To: <1354710054-23093-1-git-send-email-markwalters1009@gmail.com>\r
+References: <20121203152015.GD1020@mit.edu>\r
+       <1354710054-23093-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.14+100~gcb9b0b0 (http://notmuchmail.org) Emacs/23.4.1\r
+       (i486-pc-linux-gnu)\r
+Date: Wed, 05 Dec 2012 11:01:28 -0500\r
+Message-ID: <87k3swcwtj.fsf@awakening.csail.mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFrrDIsWRmVeSWpSXmKPExsUixG6nons7f3+AwfNzLBar5/JYXL85k9mB\r
+       yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgyjj77yprwQ6uioabn9kbGOdxdDFycEgImEg8\r
+       PQNkcgKZYhIX7q1n62Lk4hAS2Mco8fLFamYIZz2jxKarV9hAqoQELjBJ/J5cBZFYwiixqHMa\r
+       I0iCTUBfYsXaSawgtoiAq8TTb5+ZQWxhAW2JY+vfs4PYnAJeEs/WrGeHGJQp8Wn/XWaQK0QF\r
+       4iUuL1UAMVkEVCU+rzYEMXmBbru5xxikmFdAUOLkzCcsIDazgJbEjX8vmSYwCsxCkpqFJLWA\r
+       kWkVo2xKbpVubmJmTnFqsm5xcmJeXmqRrrlebmaJXmpK6SZGcCC6qOxgbD6kdIhRgINRiYdX\r
+       wnhfgBBrYllxZe4hRkkOJiVR3p+5+wOE+JLyUyozEosz4otKc1KLDzFKcDArifAW+wHleFMS\r
+       K6tSi/JhUtIcLErivNdTbvoLCaQnlqRmp6YWpBbBZGU4OJQkeB3zgBoFi1LTUyvSMnNKENJM\r
+       HJwgw3mAhseB1PAWFyTmFmemQ+RPMSpKifOGgCQEQBIZpXlwvbBE8YpRHOgVYd5QkCoeYJKB\r
+       634FNJgJaHAUO9jgkkSElFQDIyt3Hpv9t0NsjEZvnso3/Tie4pG0/2fkwqBdZ5RfcjcY6Kzg\r
+       Pt0iGs/1+eiD9JyIuJNlR7ZbG+40uB3F/uCLKbN04+p7bVtCDHMlHvYzcSjpzrikVuO8iK/C\r
+       fdqUZQpO/ntMJFNYuMpskpaltyow70wvD7OLfrTD2E5gw1TrnVxbWreWrBNXYinOSDTUYi4q\r
+       TgQASGxMfO8CAAA=\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: Wed, 05 Dec 2012 16:01:35 -0000\r
+\r
+LGTM.\r
+\r
+On Wed, 05 Dec 2012, Mark Walters <markwalters1009@gmail.com> wrote:\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
+> This fixes the comment and stashes an empty string in the\r
+> case there is nothing to stash (both suggested by Austin).\r
+>\r
+>\r
+>  emacs/notmuch-lib.el |   10 ++++++++--\r
+>  1 files changed, 8 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+> index 1d0ec17..5c44867 100644\r
+> --- a/emacs/notmuch-lib.el\r
+> +++ b/emacs/notmuch-lib.el\r
+> @@ -183,8 +183,14 @@ 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
+> +    ;; There is nothing to stash so stash an empty string so the user\r
+> +    ;; doesn't accidentally paste something else somewhere.\r
+> +    (kill-new "")\r
+> +    (message "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