From: Pieter Praet <pieter@praet.org>
To: David Bremner <david@tethera.net>
Subject: [PATCH v6 3/3] post-merge fixes
Date: Fri,  3 Feb 2012 11:24:09 +0100
Message-Id: <1328264649-27346-3-git-send-email-pieter@praet.org>
In-Reply-To: <87r4yc2p3y.fsf@praet.org>
References: <87r4yc2p3y.fsf@praet.org>
Cc: Notmuch Mail <notmuch@notmuchmail.org>
Precedence: list

---
 emacs/notmuch-mua.el |    2 +-
 test/emacs           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 3e93d7c..768b693 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -116,7 +116,7 @@ list."
   ;; properly quote them in the reply.  Note that using `point-max'
   ;; instead of `mark' here is wrong.  The buffer may include user's
   ;; signature which should not be MML-quoted.
-  (mml-quote-region (point) (point-max)))
+  (mml-quote-region (point) (mark)))
 
 (defun notmuch-mua-forward-message ()
   (message-forward)
diff --git a/test/emacs b/test/emacs
index 2d066ed..f4955fe 100755
--- a/test/emacs
+++ b/test/emacs
@@ -288,7 +288,7 @@ Subject: Re: Quote MML tags in reply
 In-Reply-To: <test-emacs-mml-quoting@message.id>
 Fcc: ${MAIL_DIR}/sent
 --text follows this line--
-On Tue, 05 Jan 2001 15:43:57 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:
+On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:
 > <#!part disposition=inline>
 EOF
 test_expect_equal_file OUTPUT EXPECTED
-- 
1.7.8.1