1 Return-Path: <todd@electricoding.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 85D9F431FBF
\r
6 for <notmuch@notmuchmail.org>; Fri, 9 Jan 2015 15:37:45 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=2.438 tagged_above=-999 required=5
\r
12 tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id f2ac-wkbF6VZ for <notmuch@notmuchmail.org>;
\r
16 Fri, 9 Jan 2015 15:37:42 -0800 (PST)
\r
17 Received: from s75.web-hosting.com (s75.web-hosting.com [198.187.31.9])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 4EDCE431FBC
\r
21 for <notmuch@notmuchmail.org>; Fri, 9 Jan 2015 15:37:42 -0800 (PST)
\r
22 Received: from user-69-73-37-128.knology.net ([69.73.37.128]:59532
\r
23 helo=localhost.localdomain)
\r
24 by server75.web-hosting.com with esmtpsa (UNKNOWN:AES128-SHA256:128)
\r
25 (Exim 4.82) (envelope-from <todd@electricoding.com>)
\r
26 id 1Y9j7c-000TvC-Ge; Fri, 09 Jan 2015 18:37:40 -0500
\r
27 From: Todd <todd@electricoding.com>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [PATCH v2] emacs: Use the message cite variable
\r
30 Date: Fri, 9 Jan 2015 17:37:07 -0600
\r
31 Message-Id: <1420846627-31763-1-git-send-email-todd@electricoding.com>
\r
32 X-Mailer: git-send-email 1.9.1
\r
33 In-Reply-To: <m2k30wukes.fsf@guru.guru-group.fi>
\r
34 References: <m2k30wukes.fsf@guru.guru-group.fi>
\r
35 X-AntiAbuse: This header was added to track abuse,
\r
36 please include it with any abuse report
\r
37 X-AntiAbuse: Primary Hostname - server75.web-hosting.com
\r
38 X-AntiAbuse: Original Domain - notmuchmail.org
\r
39 X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
\r
40 X-AntiAbuse: Sender Address Domain - electricoding.com
\r
41 X-Get-Message-Sender-Via: server75.web-hosting.com: authenticated_id:
\r
42 todd@electricoding.com
\r
46 X-BeenThere: notmuch@notmuchmail.org
\r
47 X-Mailman-Version: 2.1.13
\r
49 List-Id: "Use and development of the notmuch mail system."
\r
50 <notmuch.notmuchmail.org>
\r
51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
54 List-Post: <mailto:notmuch@notmuchmail.org>
\r
55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
58 X-List-Received-Date: Fri, 09 Jan 2015 23:37:45 -0000
\r
60 I checked in the Emacs 22.1 source code, and there it was a defaulted
\r
61 to message-cite-original as well. This patch falls back to
\r
62 message-cite-original in the unlikely case that someone has customized
\r
63 message-cite-function to nil.
\r
68 emacs/notmuch-mua.el | 6 +++---
\r
69 1 file changed, 3 insertions(+), 3 deletions(-)
\r
71 diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
\r
72 index 2c58886..2a01455 100644
\r
73 --- a/emacs/notmuch-mua.el
\r
74 +++ b/emacs/notmuch-mua.el
\r
75 @@ -220,8 +220,8 @@ list."
\r
76 (date (plist-get original-headers :Date))
\r
79 - ;; message-cite-original constructs a citation line based on the From and Date
\r
80 - ;; headers of the original message, which are assumed to be in the buffer.
\r
81 + ;; message-cite-function should construct a citation line based on the From and
\r
82 + ;; Date headers of the original message, which are assumed to be in the buffer.
\r
83 (insert "From: " from "\n")
\r
84 (insert "Date: " date "\n\n")
\r
86 @@ -233,7 +233,7 @@ list."
\r
89 ;; Quote the original message according to the user's configured style.
\r
90 - (message-cite-original)))
\r
91 + (funcall (or message-cite-function #'message-cite-original))))
\r
93 ;; Crypto processing based crypto content of the original message
\r
94 (when process-crypto
\r