[PATCH v2 2/3] vim: make the html handler configurable

diff --git a/c9/13f2412221ad4b78c5036ae49679b74ffb7a0e b/c9/13f2412221ad4b78c5036ae49679b74ffb7a0e
new file mode 100644 (file)
index 0000000..9fc63d2
--- /dev/null
+++ b/c9/13f2412221ad4b78c5036ae49679b74ffb7a0e
@@ -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 CBD47429E27\r
+       for <notmuch@notmuchmail.org>; Thu,  1 May 2014 16:08:56 -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 32oIkjLM0cnJ for <notmuch@notmuchmail.org>;\r
+       Thu,  1 May 2014 16:08:49 -0700 (PDT)\r
+Received: from mail-oa0-f51.google.com (mail-oa0-f51.google.com\r
+       [209.85.219.51]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 870BF431FBD\r
+       for <notmuch@notmuchmail.org>; Thu,  1 May 2014 16:08:41 -0700 (PDT)\r
+Received: by mail-oa0-f51.google.com with SMTP id l6so4312234oag.38\r
+       for <notmuch@notmuchmail.org>; Thu, 01 May 2014 16:08:41 -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=hdork2vFSZPvSyHiLKyIBjLzvoJKqPtyzcA+xOQOrAU=;\r
+       b=wUcptpoeZuHIJNDQfEmtgR2Yx07Se7tsrrml45ifPDHZzvDUmAzF35ml5uPB0HJWSX\r
+       igrbLFxnBrKUd94mW5wnRCY9U8yh28rkTCdWnQYAFR0go+A+2/kz2nbtYHE9/sGPc0LB\r
+       6R9dUfa5MS4WZz6/fYYDuRf3u7kbVZ3qViFYoFSmsAkMdO0fEAt+ECf7aVNrIVmvEqEg\r
+       Fk676sUiKKsbHblKdy1Jf7151hFtLlHXBUFtXrvo1pCDgFDEIMKxxlHD4pgTqBCDDq49\r
+       hOPTMKdNXYzk6MTUqJi2SIiQDszr+oL2D8iM7d8v4GgQ3jqxnOIQNS6Cm0yqZhl53vK0\r
+       sPNg==\r
+X-Received: by 10.60.144.200 with SMTP id so8mr13432649oeb.31.1398985721135;\r
+       Thu, 01 May 2014 16:08:41 -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\r
+       ut8sm62420203obc.22.2014.05.01.16.08.38 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Thu, 01 May 2014 16:08:40 -0700 (PDT)\r
+From: Felipe Contreras <felipe.contreras@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/3] vim: make the html handler configurable\r
+Date: Thu,  1 May 2014 17:57:53 -0500\r
+Message-Id: <1398985074-17646-3-git-send-email-felipe.contreras@gmail.com>\r
+X-Mailer: git-send-email 1.9.2+fc1.19.g85b6256\r
+In-Reply-To: <1398985074-17646-1-git-send-email-felipe.contreras@gmail.com>\r
+References: <1398985074-17646-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: Thu, 01 May 2014 23:08:58 -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.19.g85b6256\r
+\r