w3m

commit 15657b98a1190c78879b0dcee69aab4d22554451
parent 9130f93fa6e81226d6ef41c664eac83e2a766af1
Author: ukai <ukai>
Date:   Wed, 26 Dec 2001 01:57:19 +0000

[w3m-dev 02715] bugfix in scripts/multipart/multipart.cgi.in
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
scripts/multipart/multipart.cgi.in
 | 
5
++++-

2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-26  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 02715] bugfix in scripts/multipart/multipart.cgi.in
+	  was not applied
+	* scripts/multipart/multipart.cgi: fix "use NKF" check
+
 2001-12-26  Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
 
 	* [w3m-dev 02732] fix Debian Bug#126381
diff --git a/scripts/multipart/multipart.cgi.in b/scripts/multipart/multipart.cgi.in
@@ -1,9 +1,12 @@
 #!@PERL@
 
-if ($use_NKF = eval "use NKF;") {
+eval { use NKF; };
+if (! $@) {
+	$use_NKF = 1;
 	$CONV = "-e";
 	$MIME_DECODE = "-m -e";
 } else {
+	$use_NKF = 0;
 #	$CONV = "w3m -dump -e";
 	$CONV = "@NKF@ -e";
 	$MIME_DECODE = "@NKF@ -m -e";