yugui	2010-12-23 21:45:17 +0900 (Thu, 23 Dec 2010)

  New Revision: 30315

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

  Log:
    merges r30112 from trunk into ruby_1_9_2.
    --
    * ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc.
      patched by Kouhei Yanagita [ruby-dev:42696]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/nkf/lib/kconv.rb
    branches/ruby_1_9_2/test/nkf/test_kconv.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30314)
+++ ruby_1_9_2/ChangeLog	(revision 30315)
@@ -1,3 +1,8 @@
+Tue Dec  7 18:56:52 2010  NARUSE, Yui  <naruse@r...>
+
+	* ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc.
+	  patched by Kouhei Yanagita [ruby-dev:42696]
+
 Tue Dec  7 00:27:14 2010  Masaya Tarui  <tarui@r...>
 
 	* win32/win32.c (rb_w32_read): fixed more for readline,
Index: ruby_1_9_2/ext/nkf/lib/kconv.rb
===================================================================
--- ruby_1_9_2/ext/nkf/lib/kconv.rb	(revision 30314)
+++ ruby_1_9_2/ext/nkf/lib/kconv.rb	(revision 30315)
@@ -51,8 +51,8 @@
   # call-seq:
   #    Kconv.kconv(str, to_enc, from_enc=nil)
   #
-  # Convert <code>str</code> to out_code.
-  # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
+  # Convert <code>str</code> to <code>to_enc</code>.
+  # <code>to_enc</code> and <code>from_enc</code> are given as constants of Kconv or Encoding objects.
   def kconv(str, to_enc, from_enc=nil)
     opt = ''
     opt += ' --ic=' + from_enc.to_s if from_enc
@@ -199,10 +199,10 @@
   # call-seq:
   #    String#kconv(to_enc, from_enc)
   #
-  # Convert <code>self</code> to out_code.
-  # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
+  # Convert <code>self</code> to <code>to_enc</code>.
+  # <code>to_enc</code> and <code>from_enc</code> are given as constants of Kconv or Encoding objects.
   def kconv(to_enc, from_enc=nil)
-    form_enc = self.encoding if !from_enc && self.encoding != Encoding.list[0]
+    from_enc = self.encoding if !from_enc && self.encoding != Encoding.list[0]
     Kconv::kconv(self, to_enc, from_enc)
   end
 
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30314)
+++ ruby_1_9_2/version.h	(revision 30315)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 120
+#define RUBY_PATCHLEVEL 121
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/nkf/test_kconv.rb
===================================================================
--- ruby_1_9_2/test/nkf/test_kconv.rb	(revision 30314)
+++ ruby_1_9_2/test/nkf/test_kconv.rb	(revision 30315)
@@ -71,4 +71,11 @@
     assert_equal(@jis_str, @utf8_str.kconv(::NKF::JIS))
     assert_equal(@jis_str, @jis_str.kconv(::NKF::JIS))
   end
+  def test_kconv
+    str = "\xc2\xa1"
+    %w/UTF-8 EUC-JP/.each do |enc|
+      s = str.dup.force_encoding(enc)
+      assert_equal(s, s.kconv(enc))
+    end
+  end
 end

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