naruse	2008-07-25 04:14:47 +0900 (Fri, 25 Jul 2008)

  New Revision: 18201

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18201

  Log:
    * ext/nkf/nkf.c (rb_nkf_convert): output of mime encode is US-ASCII.

  Modified files:
    trunk/ChangeLog
    trunk/ext/nkf/nkf.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18200)
+++ ChangeLog	(revision 18201)
@@ -1,3 +1,7 @@
+Fri Jul 25 04:12:57 2008  NARUSE, Yui  <naruse@r...>
+
+	* ext/nkf/nkf.c (rb_nkf_convert): output of mime encode is US-ASCII.
+
 Fri Jul 25 02:43:11 2008  Yusuke Endoh  <mame@t...>
 
 	* sample/coverage.rb: move from lib/coverage.rb because this remains in
Index: ext/nkf/nkf.c
===================================================================
--- ext/nkf/nkf.c	(revision 18200)
+++ ext/nkf/nkf.c	(revision 18201)
@@ -169,7 +169,10 @@
     rb_str_set_len(result, output_ctr);
     OBJ_INFECT(result, src);
 
-    rb_enc_associate(result, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
+    if (mimeout_f)
+	rb_enc_associate(result, rb_usascii_encoding());
+    else
+	rb_enc_associate(result, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
 
     return result;
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/