[PATCH v6 3/3] post-merge fixes

diff --git a/72/01fc2d10abe0b4f7a5ac9bd297420f1a572c8b b/72/01fc2d10abe0b4f7a5ac9bd297420f1a572c8b
new file mode 100644 (file)
index 0000000..24ee5fc
--- /dev/null
+++ b/72/01fc2d10abe0b4f7a5ac9bd297420f1a572c8b
@@ -0,0 +1,86 @@
+Return-Path: <pieter@praet.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 12471431FC0\r
+       for <notmuch@notmuchmail.org>; Fri,  3 Feb 2012 02:26:31 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id w1heV38hddKC for <notmuch@notmuchmail.org>;\r
+       Fri,  3 Feb 2012 02:26:30 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id AC212431FCF\r
+       for <notmuch@notmuchmail.org>; Fri,  3 Feb 2012 02:26:26 -0800 (PST)\r
+Received: by wibhi8 with SMTP id hi8so2697793wib.26\r
+       for <notmuch@notmuchmail.org>; Fri, 03 Feb 2012 02:26:25 -0800 (PST)\r
+Received: by 10.180.24.7 with SMTP id q7mr10480085wif.14.1328264785540;\r
+       Fri, 03 Feb 2012 02:26:25 -0800 (PST)\r
+Received: from localhost ([109.131.13.166])\r
+       by mx.google.com with ESMTPS id m8sm15927755wia.11.2012.02.03.02.26.24\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 03 Feb 2012 02:26:25 -0800 (PST)\r
+From: Pieter Praet <pieter@praet.org>\r
+To: David Bremner <david@tethera.net>\r
+Subject: [PATCH v6 3/3] post-merge fixes\r
+Date: Fri,  3 Feb 2012 11:24:09 +0100\r
+Message-Id: <1328264649-27346-3-git-send-email-pieter@praet.org>\r
+X-Mailer: git-send-email 1.7.8.1\r
+In-Reply-To: <87r4yc2p3y.fsf@praet.org>\r
+References: <87r4yc2p3y.fsf@praet.org>\r
+Cc: Notmuch Mail <notmuch@notmuchmail.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 03 Feb 2012 10:26:31 -0000\r
+\r
+---\r
+ emacs/notmuch-mua.el |    2 +-\r
+ test/emacs           |    2 +-\r
+ 2 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 3e93d7c..768b693 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -116,7 +116,7 @@ list."\r
+   ;; properly quote them in the reply.  Note that using `point-max'\r
+   ;; instead of `mark' here is wrong.  The buffer may include user's\r
+   ;; signature which should not be MML-quoted.\r
+-  (mml-quote-region (point) (point-max)))\r
++  (mml-quote-region (point) (mark)))\r
+ \r
+ (defun notmuch-mua-forward-message ()\r
+   (message-forward)\r
+diff --git a/test/emacs b/test/emacs\r
+index 2d066ed..f4955fe 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -288,7 +288,7 @@ Subject: Re: Quote MML tags in reply\r
+ In-Reply-To: <test-emacs-mml-quoting@message.id>\r
+ Fcc: ${MAIL_DIR}/sent\r
+ --text follows this line--\r
+-On Tue, 05 Jan 2001 15:43:57 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:\r
++On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:\r
+ > <#!part disposition=inline>\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+-- \r
+1.7.8.1\r
+\r