Return-Path: <felipe.contreras@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 88C74431FC2
	for <notmuch@notmuchmail.org>; Wed, 23 Apr 2014 15:06:18 -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 hBJnKHWZCjoF for <notmuch@notmuchmail.org>;
	Wed, 23 Apr 2014 15:06:11 -0700 (PDT)
Received: from mail-oa0-f42.google.com (mail-oa0-f42.google.com
	[209.85.219.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id 6344C431FBF
	for <notmuch@notmuchmail.org>; Wed, 23 Apr 2014 15:06:11 -0700 (PDT)
Received: by mail-oa0-f42.google.com with SMTP id i4so1751373oah.1
	for <notmuch@notmuchmail.org>; Wed, 23 Apr 2014 15:06:11 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=from:to:cc:subject:date:message-id:in-reply-to:references;
	bh=VDLxwB95EmfbgzbPlPoUzdIaLKhimJhJoT/wfiK/750=;
	b=NB3oDoDaAd9CN1Gm5rJQd8XJ5kj1cVJ2nIcGimYkz9u0KQ3omXAQN5+xafMJyDEoCm
	JFdS8Sf+SnADUVdpxFwRCxI8Hbj0w6gBtcJCGhBnDLO/3Amu2cbX4BTX6mThVkXAPxDA
	XidDPXGMC/8o9c3L+24AJXh6IBYhiL4l71q2uXACp1TB9A5vSDB1au0zaH5sHhanw4hz
	G0Fc4tJW3+eIBVX71tSmkjn1kuOJty2ULkLPQdvDjZCOvnUv3qkt6sV0ze5ud+B9CTJU
	quIAIinB6EoAYX/qZgNoXmhDQMIQU7hCY8hSzHWK91XKl4ZEiXgRBsuvVCtF6d1AE5fs
	aGHg==
X-Received: by 10.182.142.229 with SMTP id rz5mr45141815obb.12.1398290415817; 
	Wed, 23 Apr 2014 15:00:15 -0700 (PDT)
Received: from localhost (189-211-224-40.static.axtel.net. [189.211.224.40])
	by mx.google.com with ESMTPSA id 10sm4311883obq.18.2014.04.23.15.00.13
	for <multiple recipients>
	(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
	Wed, 23 Apr 2014 15:00:14 -0700 (PDT)
From: Felipe Contreras <felipe.contreras@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/3] Make the html handler configurable
Date: Wed, 23 Apr 2014 16:49:43 -0500
Message-Id: <1398289784-18203-3-git-send-email-felipe.contreras@gmail.com>
X-Mailer: git-send-email 1.9.2+fc1.2.gfbaae8c
In-Reply-To: <1398289784-18203-1-git-send-email-felipe.contreras@gmail.com>
References: <1398289784-18203-1-git-send-email-felipe.contreras@gmail.com>
Cc: Paul Roberts <pmr@stelo.org.uk>
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: Wed, 23 Apr 2014 22:06:18 -0000

From: Paul Roberts <pmr@stelo.org.uk>

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 vim/notmuch.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vim/notmuch.vim b/vim/notmuch.vim
index 25a16e9..0cb94f6 100644
--- a/vim/notmuch.vim
+++ b/vim/notmuch.vim
@@ -919,7 +919,8 @@ ruby << EOF
 				if mime_type != "text/html"
 					text = decoded
 				else
-					IO.popen("elinks --dump", "w+") do |pipe|
+					IO.popen(VIM::evaluate('exists("g:notmuch_html_converter") ? ' +
+							'g:notmuch_html_converter : "elinks --dump"'), "w+") do |pipe|
 						pipe.write(decode_body)
 						pipe.close_write
 						text = pipe.read
-- 
1.9.2+fc1.2.gfbaae8c