matz	2007-11-07 03:37:49 +0900 (Wed, 07 Nov 2007)

  New Revision: 13830

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

  Log:
    * 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/ChangeLog?r1=13830&r2=13829
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=13830&r2=13829
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/rexml/encodings/SHIFT-JIS.rb?r1=13830&r2=13829

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13829)
+++ ruby_1_8/ChangeLog	(revision 13830)
@@ -1,3 +1,9 @@
+Wed Nov  7 03:32:38 2007  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]
+
 Mon Nov  5 05:17:04 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/optparse.rb (OptionParser::Switch::summarize): fix for long form
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 13829)
+++ ruby_1_8/version.h	(revision 13830)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-11-05"
+#define RUBY_RELEASE_DATE "2007-11-07"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071105
+#define RUBY_RELEASE_CODE 20071107
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 7
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/lib/rexml/encodings/SHIFT-JIS.rb
===================================================================
--- ruby_1_8/lib/rexml/encodings/SHIFT-JIS.rb	(revision 13829)
+++ ruby_1_8/lib/rexml/encodings/SHIFT-JIS.rb	(revision 13830)
@@ -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