shyouhei	2008-06-08 03:28:35 +0900 (Sun, 08 Jun 2008)

  New Revision: 16925

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/rexml/encodings/SHIFT-JIS.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 13830:
    * lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for
      nkf conversion.  a patch from <moonwolf AT moonwolf.com>.
      [ruby-dev:32183]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16925&r2=16924&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/rexml/encodings/SHIFT-JIS.rb?r1=16925&r2=16924&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16925&r2=16924&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16924)
+++ ruby_1_8_5/ChangeLog	(revision 16925)
@@ -1,3 +1,9 @@
+Sun Jun  8 03:08:11 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for
+	  nkf conversion.  a patch from <moonwolf AT moonwolf.com>.
+	  [ruby-dev:32183]
+
 Sun Jun  8 03:05:59 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/optparse.rb (OptionParser::Switch::summarize): fix for long form
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16924)
+++ ruby_1_8_5/version.h	(revision 16925)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 141
+#define RUBY_PATCHLEVEL 142
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/lib/rexml/encodings/SHIFT-JIS.rb
===================================================================
--- ruby_1_8_5/lib/rexml/encodings/SHIFT-JIS.rb	(revision 16924)
+++ ruby_1_8_5/lib/rexml/encodings/SHIFT-JIS.rb	(revision 16925)
@@ -13,8 +13,8 @@
     rescue LoadError
       require 'nkf'
 
-      SJISTOU8 = '-Swm0'
-      U8TOSJIS = '-Wsm0'
+      SJISTOU8 = '-Swm0x'
+      U8TOSJIS = '-Wsm0x'
 
       def decode_sjis(str)
         NKF.nkf(SJISTOU8, str)

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