Return-Path: <ethan.glasser.camp@gmail.com>
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 80BEB431FBD
	for <notmuch@notmuchmail.org>; Fri, 19 Oct 2012 19:31:20 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: -0.799
X-Spam-Level: 
X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
	tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
	FREEMAIL_FROM=0.001, 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 F1FbNyWwfrSS for <notmuch@notmuchmail.org>;
	Fri, 19 Oct 2012 19:31:19 -0700 (PDT)
Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com
	[209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id DA6EE431FAE
	for <notmuch@notmuchmail.org>; Fri, 19 Oct 2012 19:31:18 -0700 (PDT)
Received: by mail-vb0-f53.google.com with SMTP id fc21so1244370vbb.26
	for <notmuch@notmuchmail.org>; Fri, 19 Oct 2012 19:31:18 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=from:to:subject:in-reply-to:references:user-agent:date:message-id
	:mime-version:content-type;
	bh=QcXCbcXlQy2xlfhkzvTN82zPVk2CAOSMPWpU6H38VEE=;
	b=NUtMQocB7J2/kcZH2pWhd9QuYpUk4YRAo7+oVTpzbry7PthsBy1QI3EULxA6U0OEdS
	InnMaGJMKOlZSwaB+NA7Vh9Bj+b7mpMW7xVpAmqurHDN4aR10pGQ4H3ZrSznD41vZGXt
	Af8OGbW42lU5pnhkr/xzktTUXOBblr6BZ5UPwoUB5WHuxYMfLSz3gPmUe9mtrZrZS/2x
	1GUP1Ra51Gecg11/jn/LH1ncinTjI4ntsHweOpv04QewQx7k+lKBmae8GTr5n9PL7TCL
	nz8mH02Xfmy9PUwmAGQfKMP6IfTw+ToQt/4DxoviPxIunXNvD8mXWqw7iRUUrmAkyRS4
	ZolQ==
Received: by 10.52.180.5 with SMTP id dk5mr3243674vdc.45.1350700278344;
	Fri, 19 Oct 2012 19:31:18 -0700 (PDT)
Received: from smtp.gmail.com (p70-80.acedsl.com. [66.114.70.80])
	by mx.google.com with ESMTPS id dg6sm3235468vdc.3.2012.10.19.19.31.16
	(version=TLSv1/SSLv3 cipher=OTHER);
	Fri, 19 Oct 2012 19:31:17 -0700 (PDT)
From: Ethan Glasser-Camp <ethan.glasser.camp@gmail.com>
To: Jameson Graef Rollins <jrollins@finestructure.net>,
	Notmuch Mail <notmuch@notmuchmail.org>
Subject: Re: [PATCH 1/2] test: add emacs show mode test for toggling display
	of multipart/alternative
In-Reply-To: <1344793168-23555-1-git-send-email-jrollins@finestructure.net>
References: <87r4rf9q8x.fsf@qmul.ac.uk>
	<1344793168-23555-1-git-send-email-jrollins@finestructure.net>
User-Agent: Notmuch/0.14+45~g6ea9330 (http://notmuchmail.org) Emacs/23.3.1
	(x86_64-pc-linux-gnu)
Date: Fri, 19 Oct 2012 22:31:02 -0400
Message-ID: <874nlp7u3d.fsf@betacantrips.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Oct 2012 02:31:20 -0000

Jameson Graef Rollins <jrollins@finestructure.net> writes:

> +diff OUTPUT.{text,html} >OUTPUT.diff
> +cat <<EOF >EXPECTED.diff
> +7,9c7,10
> +< [ text/html (not shown) ]
> +< [ text/plain ]
> +< This is the text/plain part of a multipart/alternative.
> +---
> +> [ text/html ]
> +> This is the text/html part of a multipart/alternative.
> +> 
> +> [ text/plain (not shown) ]
> +EOF

Hmm, old-school diff. I guess this (instead of unified diff) is so that
if the diff isn't like this, then the diff of the diffs are clearly
readable? :)

git am complains at me because this patch introduces trailing whitespace
(to mimic, of course, the output of diff which will have trailing
whitespace as well). I would love for you to write this file using some
other technique which would not require putting trailing whitespace in
the test file.

Additionally the patch is stale, perhaps because my patch that moved some tests
to emacs-show was just pushed too.

Ethan