From 0ff468ee80afd2e2d67de401687b15e2b9c468f0 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Wed, 20 Feb 2013 17:59:34 +0900 Subject: [PATCH] Revert c7f07b3aaf5921647bd66a6ceb8f9741900bf4b2 It doesn't fix the bug. --- nkf.c | 3 +++ nkf_test.pl | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/nkf.c b/nkf.c index 388d345..705fb55 100644 --- a/nkf.c +++ b/nkf.c @@ -5111,6 +5111,9 @@ mime_prechar(nkf_char c2, nkf_char c1) } } else if (c2) { if (c2 != EOF && base64_count + mimeout_state.count/3*4> 60) { + mimeout_mode = (output_mode==ASCII ||output_mode == ISO_8859_1) ? 'Q' : 'B'; + open_mime(output_mode); + (*o_base64conv)(EOF,0); oconv_newline(o_base64conv); (*o_base64conv)(0,SP); base64_count = 1; diff --git a/nkf_test.pl b/nkf_test.pl index 9198b21..0d1de74 100644 --- a/nkf_test.pl +++ b/nkf_test.pl @@ -1353,6 +1353,11 @@ printf "%-40s", "[nkf-forum:65482] "; "\x1b\x24\x42\x7f\x21\x80\x21\x1b\x28\x42\n", "\xf0\x40\xf0\x9f\x0a"); +printf "%-40s", "[ruby-dev:47057] "; + &test("$nkf -jW -M --cp932", + "\xe3\x80\x8c\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82 by \xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x81\x82\xe3\x80\x8d\xe3\x81\xae\xe3\x83\xac\xe3\x82\xb7\xe3\x83\x94", + "=?ISO-2022-JP?B?GyRCIVYkIiQiJCIkIiQiJCIkIiQiJCIkIiQiGyhC?= by\n =?ISO-2022-JP?B?GyRCJCIkIiQiJCIkIiQiJCIkIiQiJCIhVyROJWwlNyVUGyhC?="); + if (!NKF) { printf "%-40s", "Guess NL"; &command_tests( -- 2.11.0