1 Return-Path: <awg@lagos.xvx.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 6B16D431FB6
\r
6 for <notmuch@notmuchmail.org>; Fri, 3 Feb 2012 16:32:45 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_NONE=-0.0001] 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 n5CcAG3Kmz1H for <notmuch@notmuchmail.org>;
\r
16 Fri, 3 Feb 2012 16:32:44 -0800 (PST)
\r
17 Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10])
\r
18 by olra.theworths.org (Postfix) with ESMTP id F18B1431FBD
\r
19 for <notmuch@notmuchmail.org>; Fri, 3 Feb 2012 16:32:41 -0800 (PST)
\r
20 Received: from pd2ml1so-ssvc.prod.shaw.ca ([10.0.141.139])
\r
21 by pd3mo1so-svcs.prod.shaw.ca with ESMTP; 03 Feb 2012 17:32:40 -0700
\r
22 X-Cloudmark-SP-Filtered: true
\r
23 X-Cloudmark-SP-Result: v=1.1 cv=2TvZ7eE48NdEYeaL5Xf58dNzJU178UzT+2lxUZ5Mhss=
\r
25 a=OhxnqyL4MJ8A:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17
\r
26 a=ZXeQhi9146TlpB7tSjEA:9 a=4ze6sY0TZOHs7T6yz-IA:7
\r
27 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117
\r
28 Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56])
\r
29 by pd2ml1so-dmz.prod.shaw.ca with ESMTP; 03 Feb 2012 17:32:40 -0700
\r
30 Received: by lagos.xvx.ca (Postfix, from userid 1000)
\r
31 id 9B2C1800C338; Fri, 3 Feb 2012 17:32:40 -0700 (MST)
\r
32 From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>
\r
33 To: notmuch@notmuchmail.org
\r
34 Subject: [PATCH 2/2] emacs: Fix broken showing of forwarded messages.
\r
35 Date: Fri, 3 Feb 2012 17:32:33 -0700
\r
36 Message-Id: <1328315554-16085-3-git-send-email-awg+notmuch@xvx.ca>
\r
37 X-Mailer: git-send-email 1.7.5.4
\r
38 In-Reply-To: <1328315554-16085-1-git-send-email-awg+notmuch@xvx.ca>
\r
39 References: <1328315554-16085-1-git-send-email-awg+notmuch@xvx.ca>
\r
40 X-BeenThere: notmuch@notmuchmail.org
\r
41 X-Mailman-Version: 2.1.13
\r
43 List-Id: "Use and development of the notmuch mail system."
\r
44 <notmuch.notmuchmail.org>
\r
45 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
47 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
48 List-Post: <mailto:notmuch@notmuchmail.org>
\r
49 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
50 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
52 X-List-Received-Date: Sat, 04 Feb 2012 00:32:45 -0000
\r
54 Fix the bug in showing forwarded messages with no new text by not
\r
55 hiding "original" messages if they are the entire message.
\r
57 emacs/notmuch-wash.el | 5 +++--
\r
59 2 files changed, 3 insertions(+), 3 deletions(-)
\r
61 diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el
\r
62 index 67143e5..2fe9e5d 100644
\r
63 --- a/emacs/notmuch-wash.el
\r
64 +++ b/emacs/notmuch-wash.el
\r
65 @@ -176,8 +176,9 @@ insert before the button, probably for indentation."
\r
66 (let* ((msg-start (match-beginning 0))
\r
67 (msg-end (point-max))
\r
68 (msg-lines (count-lines msg-start msg-end)))
\r
69 - (notmuch-wash-region-to-button
\r
70 - msg msg-start msg-end "original" "\n")))
\r
71 + (when (< msg-lines (count-lines (point-min) (point-max)))
\r
72 + (notmuch-wash-region-to-button
\r
73 + msg msg-start msg-end "original" "\n"))))
\r
74 (while (and (< (point) (point-max))
\r
75 (re-search-forward notmuch-wash-citation-regexp nil t))
\r
76 (let* ((cite-start (match-beginning 0))
\r
77 diff --git a/test/emacs b/test/emacs
\r
78 index b8b13a7..52683dd 100755
\r
81 @@ -350,7 +350,6 @@ Thanks for the advice! I will be sure to put it to good use.
\r
82 test_expect_equal_file OUTPUT EXPECTED
\r
84 test_begin_subtest "Non-hiding of forwarded message with no new text"
\r
85 -test_subtest_known_broken
\r
86 add_message [id]=forwarded-top-post \
\r
87 '[subject]="FW: The problem with top-posting"' \
\r