From a20d4feff7a9031076959bb4ffe664722bff3027 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Wed, 26 Dec 2001 01:57:19 +0000
Subject: [w3m-dev 02715] bugfix in scripts/multipart/multipart.cgi.in From:
 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

---
 ChangeLog                          | 8 +++++++-
 scripts/multipart/multipart.cgi.in | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d77aa3e..e72b7db 100644
--- 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
@@ -1593,4 +1599,4 @@
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.177 2001/12/25 18:14:59 ukai Exp $
+$Id: ChangeLog,v 1.178 2001/12/26 01:57:19 ukai Exp $
diff --git a/scripts/multipart/multipart.cgi.in b/scripts/multipart/multipart.cgi.in
index fb13443..d009519 100644
--- 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";
-- 
cgit v1.2.3