[PATCH v2] emacs: Use the message cite variable

diff --git a/07/a5ba36b03a39b6916e0caa56826dcf80769580 b/07/a5ba36b03a39b6916e0caa56826dcf80769580
new file mode 100644 (file)
index 0000000..6c0be50
--- /dev/null
+++ b/07/a5ba36b03a39b6916e0caa56826dcf80769580
@@ -0,0 +1,96 @@
+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 85D9F431FBF\r
+       for <notmuch@notmuchmail.org>; Fri,  9 Jan 2015 15:37:45 -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 f2ac-wkbF6VZ for <notmuch@notmuchmail.org>;\r
+       Fri,  9 Jan 2015 15:37:42 -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 4EDCE431FBC\r
+       for <notmuch@notmuchmail.org>; Fri,  9 Jan 2015 15:37:42 -0800 (PST)\r
+Received: from user-69-73-37-128.knology.net ([69.73.37.128]:59532\r
+       helo=localhost.localdomain)\r
+       by server75.web-hosting.com with esmtpsa (UNKNOWN:AES128-SHA256:128)\r
+       (Exim 4.82) (envelope-from <todd@electricoding.com>)\r
+       id 1Y9j7c-000TvC-Ge; Fri, 09 Jan 2015 18:37:40 -0500\r
+From: Todd <todd@electricoding.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] emacs: Use the message cite variable\r
+Date: Fri,  9 Jan 2015 17:37:07 -0600\r
+Message-Id: <1420846627-31763-1-git-send-email-todd@electricoding.com>\r
+X-Mailer: git-send-email 1.9.1\r
+In-Reply-To: <m2k30wukes.fsf@guru.guru-group.fi>\r
+References: <m2k30wukes.fsf@guru.guru-group.fi>\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: Fri, 09 Jan 2015 23:37:45 -0000\r
+\r
+I checked in the Emacs 22.1 source code, and there it was a defaulted\r
+to message-cite-original as well.  This patch falls back to\r
+message-cite-original in the unlikely case that someone has customized\r
+message-cite-function to nil.\r
+\r
+- Todd\r
+\r
+---\r
+ emacs/notmuch-mua.el | 6 +++---\r
+ 1 file changed, 3 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 2c58886..2a01455 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -220,8 +220,8 @@ list."\r
+           (date (plist-get original-headers :Date))\r
+           (start (point)))\r
+\r
+-      ;; message-cite-original constructs a citation line based on the From and Date\r
+-      ;; headers of the original message, which are assumed to be in the buffer.\r
++      ;; message-cite-function should construct a citation line based on the From and\r
++      ;; Date headers of the original message, which are assumed to be in the buffer.\r
+       (insert "From: " from "\n")\r
+       (insert "Date: " date "\n\n")\r
+\r
+@@ -233,7 +233,7 @@ list."\r
+       (set-mark (point))\r
+       (goto-char start)\r
+       ;; Quote the original message according to the user's configured style.\r
+-      (message-cite-original)))\r
++      (funcall (or message-cite-function #'message-cite-original))))\r
+\r
+     ;; Crypto processing based crypto content of the original message\r
+     (when process-crypto\r
+--\r
+1.9.1\r