--- /dev/null
+Return-Path: <todd@electricoding.com>\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 0DEDE431FD5\r
+ for <notmuch@notmuchmail.org>; Wed, 14 Jan 2015 15:57:15 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+ tests=[DNS_FROM_AHBL_RHSBL=2.438] 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 gfx-v+JTIQ0U for <notmuch@notmuchmail.org>;\r
+ Wed, 14 Jan 2015 15:57:11 -0800 (PST)\r
+Received: from s75.web-hosting.com (s75.web-hosting.com [198.187.31.9])\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 C78C7431FCF\r
+ for <notmuch@notmuchmail.org>; Wed, 14 Jan 2015 15:57:11 -0800 (PST)\r
+Received: from user-69-73-37-128.knology.net ([69.73.37.128]:49696\r
+ helo=tz-lab) by server75.web-hosting.com with esmtpsa\r
+ (UNKNOWN:DHE-RSA-AES128-SHA:128) (Exim 4.82) (envelope-from\r
+ <todd@electricoding.com>) id 1YBXoD-0019vu-DQ; Wed, 14 Jan 2015 18:57:09\r
+ -0500\r
+From: Todd <todd@electricoding.com>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: make citation function customizable.\r
+In-Reply-To: <1421265469-18655-1-git-send-email-david@tethera.net>\r
+References: <1420900112-9187-1-git-send-email-todd@electricoding.com>\r
+ <1421265469-18655-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.19+17~gd8b219d (http://notmuchmail.org) Emacs/24.4.1\r
+ (x86_64-unknown-linux-gnu)\r
+Date: Wed, 14 Jan 2015 17:56:40 -0600\r
+Message-ID: <874mrs6hmv.fsf@electricoding.com>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+ micalg=pgp-sha1; protocol="application/pgp-signature"\r
+X-AntiAbuse: This header was added to track abuse,\r
+ please include it with any abuse report\r
+X-AntiAbuse: Primary Hostname - server75.web-hosting.com\r
+X-AntiAbuse: Original Domain - notmuchmail.org\r
+X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]\r
+X-AntiAbuse: Sender Address Domain - electricoding.com\r
+X-Get-Message-Sender-Via: server75.web-hosting.com: authenticated_id:\r
+ todd@electricoding.com\r
+X-Source: \r
+X-Source-Args: \r
+X-Source-Dir: \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, 14 Jan 2015 23:57:15 -0000\r
+\r
+--=-=-=\r
+Content-Type: text/plain\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+\r
+Looks good to me. I applied the patch and it works fine as well.\r
+\r
+=2D Todd\r
+\r
+>>>>> "DB" =3D=3D David Bremner <david@tethera.net> writes:\r
+\r
+ DB> Make a new customizable variable instead of relying on\r
+ DB> message-cite-function because the default for the latter changed\r
+ DB> between emacs releases.\r
+\r
+ DB> The defcustom is borrowed from the message.el source, with minor\r
+ DB> modifications.\r
+ DB> ---\r
+\r
+ DB> Thanks to Todd for tracking down the wibbly wobbly timey wimey beha=\r
+viour of this variable. I propose to add our own variable to avoid surprisi=\r
+ng notmuch-emacs users.\r
+\r
+ DB> emacs/notmuch-mua.el | 23 ++++++++++++++++++++---\r
+ DB> 1 file changed, 20 insertions(+), 3 deletions(-)\r
+\r
+ DB> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+ DB> index 2c58886..33f1399 100644\r
+ DB> --- a/emacs/notmuch-mua.el\r
+ DB> +++ b/emacs/notmuch-mua.el\r
+ DB> @@ -75,6 +75,22 @@ list."\r
+ DB> :type '(repeat string)\r
+ DB> :group 'notmuch-send)\r
+=20\r
+ DB> +(defgroup notmuch-reply nil\r
+ DB> + "Replying to messages in notmuch"\r
+ DB> + :group 'notmuch)\r
+ DB> +\r
+ DB> +(defcustom notmuch-mua-cite-function 'message-cite-original\r
+ DB> + "*Function for citing an original message.\r
+ DB> +Predefined functions include `message-cite-original' and\r
+ DB> +`message-cite-original-without-signature'.\r
+ DB> +Note that these functions use `mail-citation-hook' if that is non-=\r
+nil."\r
+ DB> + :type '(radio (function-item message-cite-original)\r
+ DB> + (function-item message-cite-original-without-signature)\r
+ DB> + (function-item sc-cite-original)\r
+ DB> + (function :tag "Other"))\r
+ DB> + :link '(custom-manual "(message)Insertion Variables")\r
+ DB> + :group 'notmuch-reply)\r
+ DB> +\r
+ DB> ;;\r
+=20\r
+ DB> (defun notmuch-mua-get-switch-function ()\r
+ DB> @@ -220,8 +236,9 @@ list."\r
+ DB> (date (plist-get original-headers :Date))\r
+ DB> (start (point)))\r
+=20\r
+ DB> - ;; message-cite-original constructs a citation line based on the =\r
+>From and Date\r
+ DB> - ;; headers of the original message, which are assumed to be in th=\r
+e buffer.\r
+ DB> + ;; notmuch-mua-cite-function constructs a citation line based\r
+ DB> + ;; on the From and Date headers of the original message, which\r
+ DB> + ;; are assumed to be in the buffer.\r
+ DB> (insert "From: " from "\n")\r
+ DB> (insert "Date: " date "\n\n")\r
+=20\r
+ DB> @@ -233,7 +250,7 @@ list."\r
+ DB> (set-mark (point))\r
+ DB> (goto-char start)\r
+ DB> ;; Quote the original message according to the user's configured =\r
+style.\r
+ DB> - (message-cite-original)))\r
+ DB> + (funcall notmuch-mua-cite-function)))\r
+=20\r
+ DB> ;; Crypto processing based crypto content of the original mess=\r
+age\r
+ DB> (when process-crypto\r
+ DB> --=20\r
+ DB> 2.1.4\r
+\r
+ DB> _______________________________________________\r
+ DB> notmuch mailing list\r
+ DB> notmuch@notmuchmail.org\r
+ DB> http://notmuchmail.org/mailman/listinfo/notmuch\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature; name="signature.asc"\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1\r
+\r
+iQIcBAEBAgAGBQJUtwI5AAoJEEc0ULlfRYDu96cP/3FgSKGU+serpctGnbVEMuP4\r
+YDa4aMfLEldHisofCzzxonqd49PM6GjlKor9DVabmOwswiHjdJBeyN+Mfp2EJ0Zj\r
+btw/1JAu7eZrjDvc1ORGqUhuQ5gzxznSIfSqvNnsT+eLczbh9TqhHyzOz5et03Lw\r
+r19Ddh+BxeRQKpFkX/9VB0TOzwUN5pF/GCtk2FWqghXxxLgb8ymQcfZkWhx7dg1R\r
+F5I5G/Iko+gwBIU0cbFRdwNtoEUiCOHSL35qNEOwpc8DVF/XUE0O1GO7So7y7VuY\r
+yLJUftrMSfNqHmwB15eZPyNcSQhIk6ZKRY8N9pvn7Ltv9poq6TZf6evqaeBiHWQl\r
+XFa41kkvu84jNr4jcuS0qKsoYG/tv2ZgmiT8UpP92uIggP145d7rDjiHEpkaIEOA\r
+ftTVuCm8yFiVsicPwrZqeCnuSP2vauvOaZ8g5ScAdr1X9ljPGvTGCo1WvFM9n1Iu\r
+s3k2CanQZDniSV4zEkWYpmyIgF420/rQJlEAnl6JzVYfta56rKPg8vEZchfGSNLr\r
+Dd80zPXe4aL0bOrAsYK0HTcN+cZ0b/RnIJLIdAPGb1Gw4ptaaURGd/tIkdT6b/Ql\r
+h7s+kv9bU7MvL0OCVKEFMxEcgLNeZrs2OFZNt646kbg4yihFj6YkM7YG5GFoDAbn\r
+tm9y6tkD/Ilqq2lI2zDD\r
+=5r9p\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r