From: Ken Hornstein <kenh@pobox.com>
Date: Tue, 18 Feb 2014 17:38:06 +0000 (-0500)
Subject: Fix for bug #41618: Supply charset to w3m when converting text/html parts.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/db50a93031e37e78e38b318c40a2d4a045b72900?ds=inline;hp=bf58e45a34dcf8300098abff38c4e7393152f365

Fix for bug #41618: Supply charset to w3m when converting text/html parts.
---

diff --git a/docs/contrib/replyfilter b/docs/contrib/replyfilter
index cbb8fff1..7f5b4475 100755
--- a/docs/contrib/replyfilter
+++ b/docs/contrib/replyfilter
@@ -68,11 +68,11 @@ $outcharset = 'utf-8';
 $maxcolwidth = 78;
 
 #
-# Out HTML converter program & arguments
+# Out HTML converter program & arguments. charset will be appended
 #
 
 @htmlconv = ('w3m', '-dump', '-cols', $maxcolwidth - 2, '-T', 'text/html',
-	     '-O', $outcharset);
+	     '-O', $outcharset, '-I');
 
 
 die "Usage: $0 Content-type content-transfer-encoding quote-prefix\n"
@@ -400,7 +400,8 @@ sub process_html (*$$;$)
 		# Exec our converter
 		#
 
-		exec (@htmlconv) ||
+		my @conv = (@htmlconv, $charset);
+		exec (@conv) ||
 				die "Unable to exec $filterprogram: $!\n";
 	} else {
 		die "Fork for $htmlconv[0] failed: $!\n";