1 Return-Path: <bremner@tesseract.cs.unb.ca>
\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 1D082431FCF
\r
6 for <notmuch@notmuchmail.org>; Wed, 14 Jan 2015 11:59:03 -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 ZS1oDz+lNnLs for <notmuch@notmuchmail.org>;
\r
16 Wed, 14 Jan 2015 11:58:59 -0800 (PST)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id DE753431FC3
\r
21 for <notmuch@notmuchmail.org>; Wed, 14 Jan 2015 11:58:59 -0800 (PST)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tesseract.cs.unb.ca>)
\r
24 id 1YBU5g-0006Kc-8I; Wed, 14 Jan 2015 15:58:56 -0400
\r
25 Received: (nullmailer pid 18800 invoked by uid 1000); Wed, 14 Jan 2015
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [PATCH] emacs: make citation function customizable.
\r
30 Date: Wed, 14 Jan 2015 20:57:49 +0100
\r
31 Message-Id: <1421265469-18655-1-git-send-email-david@tethera.net>
\r
32 X-Mailer: git-send-email 2.1.4
\r
33 In-Reply-To: <1420900112-9187-1-git-send-email-todd@electricoding.com>
\r
34 References: <1420900112-9187-1-git-send-email-todd@electricoding.com>
\r
35 X-BeenThere: notmuch@notmuchmail.org
\r
36 X-Mailman-Version: 2.1.13
\r
38 List-Id: "Use and development of the notmuch mail system."
\r
39 <notmuch.notmuchmail.org>
\r
40 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
41 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
42 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
43 List-Post: <mailto:notmuch@notmuchmail.org>
\r
44 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
45 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
47 X-List-Received-Date: Wed, 14 Jan 2015 19:59:03 -0000
\r
49 Make a new customizable variable instead of relying on
\r
50 message-cite-function because the default for the latter changed
\r
51 between emacs releases.
\r
53 The defcustom is borrowed from the message.el source, with minor
\r
57 Thanks to Todd for tracking down the wibbly wobbly timey wimey behaviour of this variable. I propose to add our own variable to avoid surprising notmuch-emacs users.
\r
59 emacs/notmuch-mua.el | 23 ++++++++++++++++++++---
\r
60 1 file changed, 20 insertions(+), 3 deletions(-)
\r
62 diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
\r
63 index 2c58886..33f1399 100644
\r
64 --- a/emacs/notmuch-mua.el
\r
65 +++ b/emacs/notmuch-mua.el
\r
66 @@ -75,6 +75,22 @@ list."
\r
67 :type '(repeat string)
\r
68 :group 'notmuch-send)
\r
70 +(defgroup notmuch-reply nil
\r
71 + "Replying to messages in notmuch"
\r
74 +(defcustom notmuch-mua-cite-function 'message-cite-original
\r
75 + "*Function for citing an original message.
\r
76 +Predefined functions include `message-cite-original' and
\r
77 +`message-cite-original-without-signature'.
\r
78 +Note that these functions use `mail-citation-hook' if that is non-nil."
\r
79 + :type '(radio (function-item message-cite-original)
\r
80 + (function-item message-cite-original-without-signature)
\r
81 + (function-item sc-cite-original)
\r
82 + (function :tag "Other"))
\r
83 + :link '(custom-manual "(message)Insertion Variables")
\r
84 + :group 'notmuch-reply)
\r
88 (defun notmuch-mua-get-switch-function ()
\r
89 @@ -220,8 +236,9 @@ list."
\r
90 (date (plist-get original-headers :Date))
\r
93 - ;; message-cite-original constructs a citation line based on the From and Date
\r
94 - ;; headers of the original message, which are assumed to be in the buffer.
\r
95 + ;; notmuch-mua-cite-function constructs a citation line based
\r
96 + ;; on the From and Date headers of the original message, which
\r
97 + ;; are assumed to be in the buffer.
\r
98 (insert "From: " from "\n")
\r
99 (insert "Date: " date "\n\n")
\r
101 @@ -233,7 +250,7 @@ list."
\r
104 ;; Quote the original message according to the user's configured style.
\r
105 - (message-cite-original)))
\r
106 + (funcall notmuch-mua-cite-function)))
\r
108 ;; Crypto processing based crypto content of the original message
\r
109 (when process-crypto
\r