From 674ecedd220e9fcbab9fa38a92277afc64dc135e Mon Sep 17 00:00:00 2001 From: Pieter Praet Date: Fri, 3 Feb 2012 11:24:09 +0100 Subject: [PATCH] [PATCH v6 3/3] post-merge fixes --- 72/01fc2d10abe0b4f7a5ac9bd297420f1a572c8b | 86 +++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 72/01fc2d10abe0b4f7a5ac9bd297420f1a572c8b diff --git a/72/01fc2d10abe0b4f7a5ac9bd297420f1a572c8b b/72/01fc2d10abe0b4f7a5ac9bd297420f1a572c8b new file mode 100644 index 000000000..24ee5fc7a --- /dev/null +++ b/72/01fc2d10abe0b4f7a5ac9bd297420f1a572c8b @@ -0,0 +1,86 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 12471431FC0 + for ; Fri, 3 Feb 2012 02:26:31 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id w1heV38hddKC for ; + Fri, 3 Feb 2012 02:26:30 -0800 (PST) +Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com + [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id AC212431FCF + for ; Fri, 3 Feb 2012 02:26:26 -0800 (PST) +Received: by wibhi8 with SMTP id hi8so2697793wib.26 + for ; Fri, 03 Feb 2012 02:26:25 -0800 (PST) +Received: by 10.180.24.7 with SMTP id q7mr10480085wif.14.1328264785540; + Fri, 03 Feb 2012 02:26:25 -0800 (PST) +Received: from localhost ([109.131.13.166]) + by mx.google.com with ESMTPS id m8sm15927755wia.11.2012.02.03.02.26.24 + (version=TLSv1/SSLv3 cipher=OTHER); + Fri, 03 Feb 2012 02:26:25 -0800 (PST) +From: Pieter Praet +To: David Bremner +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> +X-Mailer: git-send-email 1.7.8.1 +In-Reply-To: <87r4yc2p3y.fsf@praet.org> +References: <87r4yc2p3y.fsf@praet.org> +Cc: Notmuch Mail +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 03 Feb 2012 10:26:31 -0000 + +--- + 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: + Fcc: ${MAIL_DIR}/sent + --text follows this line-- +-On Tue, 05 Jan 2001 15:43:57 -0000, Notmuch Test Suite wrote: ++On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite wrote: + > <#!part disposition=inline> + EOF + test_expect_equal_file OUTPUT EXPECTED +-- +1.7.8.1 + -- 2.26.2