[PATCH 2/3] Make the html handler configurable

diff --git a/7f/0340f00960e47540b6e7678d168598bae7cdbe b/7f/0340f00960e47540b6e7678d168598bae7cdbe
new file mode 100644 (file)
index 0000000..009771e
--- /dev/null
+++ b/7f/0340f00960e47540b6e7678d168598bae7cdbe
@@ -0,0 +1,87 @@
+Return-Path: <felipe.contreras@gmail.com>\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 88C74431FC2\r
+       for <notmuch@notmuchmail.org>; Wed, 23 Apr 2014 15:06:18 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 hBJnKHWZCjoF for <notmuch@notmuchmail.org>;\r
+       Wed, 23 Apr 2014 15:06:11 -0700 (PDT)\r
+Received: from mail-oa0-f42.google.com (mail-oa0-f42.google.com\r
+       [209.85.219.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6344C431FBF\r
+       for <notmuch@notmuchmail.org>; Wed, 23 Apr 2014 15:06:11 -0700 (PDT)\r
+Received: by mail-oa0-f42.google.com with SMTP id i4so1751373oah.1\r
+       for <notmuch@notmuchmail.org>; Wed, 23 Apr 2014 15:06:11 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=VDLxwB95EmfbgzbPlPoUzdIaLKhimJhJoT/wfiK/750=;\r
+       b=NB3oDoDaAd9CN1Gm5rJQd8XJ5kj1cVJ2nIcGimYkz9u0KQ3omXAQN5+xafMJyDEoCm\r
+       JFdS8Sf+SnADUVdpxFwRCxI8Hbj0w6gBtcJCGhBnDLO/3Amu2cbX4BTX6mThVkXAPxDA\r
+       XidDPXGMC/8o9c3L+24AJXh6IBYhiL4l71q2uXACp1TB9A5vSDB1au0zaH5sHhanw4hz\r
+       G0Fc4tJW3+eIBVX71tSmkjn1kuOJty2ULkLPQdvDjZCOvnUv3qkt6sV0ze5ud+B9CTJU\r
+       quIAIinB6EoAYX/qZgNoXmhDQMIQU7hCY8hSzHWK91XKl4ZEiXgRBsuvVCtF6d1AE5fs\r
+       aGHg==\r
+X-Received: by 10.182.142.229 with SMTP id rz5mr45141815obb.12.1398290415817; \r
+       Wed, 23 Apr 2014 15:00:15 -0700 (PDT)\r
+Received: from localhost (189-211-224-40.static.axtel.net. [189.211.224.40])\r
+       by mx.google.com with ESMTPSA id 10sm4311883obq.18.2014.04.23.15.00.13\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Wed, 23 Apr 2014 15:00:14 -0700 (PDT)\r
+From: Felipe Contreras <felipe.contreras@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] Make the html handler configurable\r
+Date: Wed, 23 Apr 2014 16:49:43 -0500\r
+Message-Id: <1398289784-18203-3-git-send-email-felipe.contreras@gmail.com>\r
+X-Mailer: git-send-email 1.9.2+fc1.2.gfbaae8c\r
+In-Reply-To: <1398289784-18203-1-git-send-email-felipe.contreras@gmail.com>\r
+References: <1398289784-18203-1-git-send-email-felipe.contreras@gmail.com>\r
+Cc: Paul Roberts <pmr@stelo.org.uk>\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: Wed, 23 Apr 2014 22:06:18 -0000\r
+\r
+From: Paul Roberts <pmr@stelo.org.uk>\r
+\r
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
+---\r
+ vim/notmuch.vim | 3 ++-\r
+ 1 file changed, 2 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/vim/notmuch.vim b/vim/notmuch.vim\r
+index 25a16e9..0cb94f6 100644\r
+--- a/vim/notmuch.vim\r
++++ b/vim/notmuch.vim\r
+@@ -919,7 +919,8 @@ ruby << EOF\r
+                               if mime_type != "text/html"\r
+                                       text = decoded\r
+                               else\r
+-                                      IO.popen("elinks --dump", "w+") do |pipe|\r
++                                      IO.popen(VIM::evaluate('exists("g:notmuch_html_converter") ? ' +\r
++                                                      'g:notmuch_html_converter : "elinks --dump"'), "w+") do |pipe|\r
+                                               pipe.write(decode_body)\r
+                                               pipe.close_write\r
+                                               text = pipe.read\r
+-- \r
+1.9.2+fc1.2.gfbaae8c\r
+\r