From 4a8ac3c5b21f21fb12c037e782adee53061e77bf Mon Sep 17 00:00:00 2001 From: Todd Date: Sat, 10 Jan 2015 17:37:07 +1800 Subject: [PATCH] [PATCH v2] emacs: Use the message cite variable --- 07/a5ba36b03a39b6916e0caa56826dcf80769580 | 96 +++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 07/a5ba36b03a39b6916e0caa56826dcf80769580 diff --git a/07/a5ba36b03a39b6916e0caa56826dcf80769580 b/07/a5ba36b03a39b6916e0caa56826dcf80769580 new file mode 100644 index 000000000..6c0be50a8 --- /dev/null +++ b/07/a5ba36b03a39b6916e0caa56826dcf80769580 @@ -0,0 +1,96 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 85D9F431FBF + for ; Fri, 9 Jan 2015 15:37:45 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.438 +X-Spam-Level: ** +X-Spam-Status: No, score=2.438 tagged_above=-999 required=5 + tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id f2ac-wkbF6VZ for ; + Fri, 9 Jan 2015 15:37:42 -0800 (PST) +Received: from s75.web-hosting.com (s75.web-hosting.com [198.187.31.9]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 4EDCE431FBC + for ; Fri, 9 Jan 2015 15:37:42 -0800 (PST) +Received: from user-69-73-37-128.knology.net ([69.73.37.128]:59532 + helo=localhost.localdomain) + by server75.web-hosting.com with esmtpsa (UNKNOWN:AES128-SHA256:128) + (Exim 4.82) (envelope-from ) + id 1Y9j7c-000TvC-Ge; Fri, 09 Jan 2015 18:37:40 -0500 +From: Todd +To: notmuch@notmuchmail.org +Subject: [PATCH v2] emacs: Use the message cite variable +Date: Fri, 9 Jan 2015 17:37:07 -0600 +Message-Id: <1420846627-31763-1-git-send-email-todd@electricoding.com> +X-Mailer: git-send-email 1.9.1 +In-Reply-To: +References: +X-AntiAbuse: This header was added to track abuse, + please include it with any abuse report +X-AntiAbuse: Primary Hostname - server75.web-hosting.com +X-AntiAbuse: Original Domain - notmuchmail.org +X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] +X-AntiAbuse: Sender Address Domain - electricoding.com +X-Get-Message-Sender-Via: server75.web-hosting.com: authenticated_id: + todd@electricoding.com +X-Source: +X-Source-Args: +X-Source-Dir: +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 09 Jan 2015 23:37:45 -0000 + +I checked in the Emacs 22.1 source code, and there it was a defaulted +to message-cite-original as well. This patch falls back to +message-cite-original in the unlikely case that someone has customized +message-cite-function to nil. + +- Todd + +--- + emacs/notmuch-mua.el | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el +index 2c58886..2a01455 100644 +--- a/emacs/notmuch-mua.el ++++ b/emacs/notmuch-mua.el +@@ -220,8 +220,8 @@ list." + (date (plist-get original-headers :Date)) + (start (point))) + +- ;; message-cite-original constructs a citation line based on the From and Date +- ;; headers of the original message, which are assumed to be in the buffer. ++ ;; message-cite-function should construct a citation line based on the From and ++ ;; Date headers of the original message, which are assumed to be in the buffer. + (insert "From: " from "\n") + (insert "Date: " date "\n\n") + +@@ -233,7 +233,7 @@ list." + (set-mark (point)) + (goto-char start) + ;; Quote the original message according to the user's configured style. +- (message-cite-original))) ++ (funcall (or message-cite-function #'message-cite-original)))) + + ;; Crypto processing based crypto content of the original message + (when process-crypto +-- +1.9.1 -- 2.26.2