1 Return-Path: <jani@nikula.org>
\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 2CDDA431FAE
\r
6 for <notmuch@notmuchmail.org>; Wed, 28 Aug 2013 12:34:34 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
13 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id g4aN0dtpoMRC for <notmuch@notmuchmail.org>;
\r
17 Wed, 28 Aug 2013 12:34:28 -0700 (PDT)
\r
18 Received: from mail-ee0-f42.google.com (mail-ee0-f42.google.com
\r
19 [74.125.83.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
20 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
21 63F4D431FC4 for <notmuch@notmuchmail.org>; Wed, 28 Aug 2013 12:34:28 -0700
\r
23 Received: by mail-ee0-f42.google.com with SMTP id b45so3177631eek.15
\r
24 for <notmuch@notmuchmail.org>; Wed, 28 Aug 2013 12:34:27 -0700 (PDT)
\r
25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=google.com; s=20120113;
\r
27 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
\r
28 :references:in-reply-to:references;
\r
29 bh=TRDiVDDQCp6662WBQOOA0WoquVwqrGGsTCyo69NQkhg=;
\r
30 b=R73PMtFTx/I3w18ZTMGBYWjS7sS1uWbNDSwfFbDc2/BJ3pB/8M8IjSSKfxxIPSfQDL
\r
31 qVH1Gw5XX0LOBHg7cYlGUGPf8SKBV9xNUyIhGyDCYmpbMBAAGypIR3cggc04z0dlirwP
\r
32 2DT80gFp9LOWxKi6Wwr700VaEcO7Hha8JDE4pyXtu5zZWHjh2+Y2Tu+NFM+YdpynHJRA
\r
33 MbybKx/qH0nE5W6gq+1NO70RD0guYEnG56yC7FJF1tfk+gBHZUWajCGhURBf4VRfGJGI
\r
34 LgiHcEHGHYiKQSqmS0mTdrStV0+vIktsho0uUboySIvnoMYeKFb5HiqHztDGiP2ArHDr
\r
37 ALoCoQmYSbXz5wVxbg0ptfPuHhG62epQ2S4Qry0HgoqF1ucwqBtVGugpjjjpV87oEM/i0uGPeFTm
\r
38 X-Received: by 10.14.207.132 with SMTP id n4mr2451531eeo.102.1377718467248;
\r
39 Wed, 28 Aug 2013 12:34:27 -0700 (PDT)
\r
40 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.
\r
42 by mx.google.com with ESMTPSA id m54sm40026815eex.2.1969.12.31.16.00.00
\r
43 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
44 Wed, 28 Aug 2013 12:34:26 -0700 (PDT)
\r
45 From: Jani Nikula <jani@nikula.org>
\r
46 To: notmuch@notmuchmail.org
\r
47 Subject: [PATCH 2/2] emacs: slightly cleanup the reply code
\r
48 Date: Wed, 28 Aug 2013 22:34:22 +0300
\r
50 <d06cb294c7bc815cad1171bfec994832401e285f.1377718199.git.jani@nikula.org>
\r
51 X-Mailer: git-send-email 1.7.10.4
\r
52 In-Reply-To: <cover.1377718199.git.jani@nikula.org>
\r
53 References: <cover.1377718199.git.jani@nikula.org>
\r
54 In-Reply-To: <cover.1377718199.git.jani@nikula.org>
\r
55 References: <cover.1377718199.git.jani@nikula.org>
\r
56 Cc: Tomi Ollila <tomi.ollila@iki.fi>,
\r
57 Geoffrey Ferrari <geoffrey.ferrari@oriel.oxon.org>
\r
58 X-BeenThere: notmuch@notmuchmail.org
\r
59 X-Mailman-Version: 2.1.13
\r
61 List-Id: "Use and development of the notmuch mail system."
\r
62 <notmuch.notmuchmail.org>
\r
63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
64 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
66 List-Post: <mailto:notmuch@notmuchmail.org>
\r
67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
69 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
70 X-List-Received-Date: Wed, 28 Aug 2013 19:34:34 -0000
\r
72 Since the starting point for the original message can now be found
\r
73 with the simple (message-goto-body), there's no need to save
\r
74 point. Drop the extra let block. No functional changes.
\r
76 emacs/notmuch-mua.el | 35 +++++++++++++++++------------------
\r
77 1 file changed, 17 insertions(+), 18 deletions(-)
\r
79 diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
\r
80 index a4be394..c800250 100644
\r
81 --- a/emacs/notmuch-mua.el
\r
82 +++ b/emacs/notmuch-mua.el
\r
83 @@ -193,24 +193,23 @@ list."
\r
84 ;; Move point to the beginning of the message body.
\r
87 - (let ((from (plist-get original-headers :From))
\r
88 - (date (plist-get original-headers :Date))
\r
91 - ;; message-cite-original constructs a citation line based on the From and Date
\r
92 - ;; headers of the original message, which are assumed to be in the buffer.
\r
93 - (insert "From: " from "\n")
\r
94 - (insert "Date: " date "\n\n")
\r
96 - ;; Get the parts of the original message that should be quoted; this includes
\r
97 - ;; all the text parts, except the non-preferred ones in a multipart/alternative.
\r
98 - (let ((quotable-parts (notmuch-mua-get-quotable-parts (plist-get original :body))))
\r
99 - (mapc (apply-partially 'notmuch-mua-insert-quotable-part original) quotable-parts))
\r
101 - (set-mark (point))
\r
102 - (goto-char start)
\r
103 - ;; Quote the original message according to the user's configured style.
\r
104 - (message-cite-original))))
\r
105 + ;; message-cite-original constructs a citation line based on the
\r
106 + ;; From and Date headers of the original message, which are
\r
107 + ;; assumed to be in the buffer.
\r
108 + (insert "From: " (plist-get original-headers :From) "\n")
\r
109 + (insert "Date: " (plist-get original-headers :Date) "\n\n")
\r
111 + ;; Get the parts of the original message that should be quoted;
\r
112 + ;; this includes all the text parts, except the non-preferred
\r
113 + ;; ones in a multipart/alternative.
\r
114 + (let ((quotable-parts (notmuch-mua-get-quotable-parts (plist-get original :body))))
\r
115 + (mapc (apply-partially 'notmuch-mua-insert-quotable-part original) quotable-parts))))
\r
117 + ;; Quote the original message according to the user's configured
\r
119 + (set-mark (point))
\r
120 + (message-goto-body)
\r
121 + (message-cite-original)
\r
123 (goto-char (point-max))
\r