--- /dev/null
+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 ADB69431FB6\r
+ for <notmuch@notmuchmail.org>; Mon, 3 Jun 2013 21:01:20 -0700 (PDT)\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 5gc8N4NI32+U for <notmuch@notmuchmail.org>;\r
+ Mon, 3 Jun 2013 21:01:12 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu\r
+ [18.9.25.15])\r
+ by olra.theworths.org (Postfix) with ESMTP id 6A440431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 3 Jun 2013 21:01:12 -0700 (PDT)\r
+X-AuditID: 1209190f-b7fb76d0000008e6-bd-51ad6687b336\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 47.2B.02278.7866DA15; Tue, 4 Jun 2013 00:01:11 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id r54418Mt003154; \r
+ Tue, 4 Jun 2013 00:01:09 -0400\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.8/8.12.4) with ESMTP id r54413wI015380\r
+ (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+ Tue, 4 Jun 2013 00:01:07 -0400\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1UjiQh-0004vR-4U; Tue, 04 Jun 2013 00:01:03 -0400\r
+Date: Tue, 4 Jun 2013 00:01:02 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: david@tethera.net\r
+Subject: Re: [PATCH] emacs: remove hardcoded defaults values from docstrings\r
+Message-ID: <20130604040102.GJ5999@mit.edu>\r
+References: <1370181885-23021-1-git-send-email-david@tethera.net>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1370181885-23021-1-git-send-email-david@tethera.net>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFuphleLIzCtJLcpLzFFi42IR4hTV1m1PWxtosPU0m8XGZT+ZLW60djNa\r
+ XL85k9mB2eNX21xmj2erbjF7bDn0njmAOYrLJiU1J7MstUjfLoEr43xLO1NBo1DF0uONbA2M\r
+ 5/m6GDk5JARMJFZu2MoKYYtJXLi3nq2LkYtDSGAfo8TaK59ZIJwNjBLH/k2Fypxikji48BMT\r
+ hLOEUaLhx2wmkH4WARWJP8dms4HYbAIaEtv2L2cEsUUERCVOb5oEtoNZwF5i0exJ7CC2sICP\r
+ xP2N14DqOTh4BbQlGnvTQEwhAUeJNysFQSp4BQQlTs58wgLRqSVx499LJpASZgFpieX/OEDC\r
+ nAJOEp+nrwdbKgp0wJST29gmMArNQtI9C0n3LITuBYzMqxhlU3KrdHMTM3OKU5N1i5MT8/JS\r
+ i3RN9HIzS/RSU0o3MYIDXZJ/B+O3g0qHGAU4GJV4eBW2rAkUYk0sK67MPcQoycGkJMp7In5t\r
+ oBBfUn5KZUZicUZ8UWlOavEhRgkOZiUR3l4XoBxvSmJlVWpRPkxKmoNFSZz3aspNfyGB9MSS\r
+ 1OzU1ILUIpisDAeHkgSvVCpQo2BRanpqRVpmTglCmomDE2Q4D9BwFpAa3uKCxNzizHSI/ClG\r
+ RSlxXnuQhABIIqM0D64XloheMYoDvSLMyw5SxQNMYnDdr4AGMwENnvx6FcjgkkSElFQD46Tq\r
+ T2UWs3+dd80/vXjKlnWyKWrM9SrGNY2N92bV3rq/TNZA/7Gr7PItD9gz+LjPSf1rz+S7aMk4\r
+ T+fP4U79Gd7WDVU7/XKtb267K+V58KvA6w3FgTYVFzwNmgW7U7Uz2T8F6FhcW7qlN0LtR09W\r
+ ifAU4/DX/38/aPz+2iR94rbj9pU1Nxh3KbEUZyQaajEXFScCABBqtHEfAwAA\r
+Cc: notmuch@notmuchmail.org, David Bremner <bremner@debian.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: Tue, 04 Jun 2013 04:01:20 -0000\r
+\r
+I realize this already got pushed, but to me this seems like a\r
+reversion for the 95% of users who haven't customized\r
+notmuch-archive-tags and just want to know that archiving means\r
+removing the inbox tag. Why is this less confusing? Users who have\r
+customized notmuch-archive-tags will probably know that the "default"\r
+doesn't apply to them.\r
+\r
+Quoth david@tethera.net on Jun 02 at 11:04 am:\r
+> From: David Bremner <bremner@debian.org>\r
+> \r
+> These functions refer to default values of variables, but it seems\r
+> less confusing and less likely to get out of date to just allow the\r
+> user to follow the help cross-reference links.\r
+> ---\r
+> emacs/notmuch-show.el | 14 ++++++--------\r
+> 1 file changed, 6 insertions(+), 8 deletions(-)\r
+> \r
+> another proposed change from our notmuch-pick discussions.\r
+> \r
+> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+> index 613e666..600e802 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -1835,10 +1835,9 @@ search results instead."\r
+> "Archive each message in thread.\r
+> \r
+> Archive each message currently shown by applying the tag changes\r
+> -in `notmuch-archive-tags' to each (remove the \"inbox\" tag by\r
+> -default). If a prefix argument is given, the messages will be\r
+> -\"unarchived\", i.e. the tag changes in `notmuch-archive-tags'\r
+> -will be reversed.\r
+> +in `notmuch-archive-tags' to each. If a prefix argument is given,\r
+> +the messages will be \"unarchived\", i.e. the tag changes in\r
+> +`notmuch-archive-tags' will be reversed.\r
+> \r
+> Note: This command is safe from any race condition of new messages\r
+> being delivered to the same thread. It does not archive the\r
+> @@ -1865,10 +1864,9 @@ buffer."\r
+> "Archive the current message.\r
+> \r
+> Archive the current message by applying the tag changes in\r
+> -`notmuch-archive-tags' to it (remove the \"inbox\" tag by\r
+> -default). If a prefix argument is given, the message will be\r
+> -\"unarchived\", i.e. the tag changes in `notmuch-archive-tags'\r
+> -will be reversed."\r
+> +`notmuch-archive-tags' to it. If a prefix argument is given, the\r
+> +message will be \"unarchived\", i.e. the tag changes in\r
+> +`notmuch-archive-tags' will be reversed."\r
+> (interactive "P")\r
+> (when notmuch-archive-tags\r
+> (apply 'notmuch-show-tag-message\r