ruby-changes:5425
From: shyouhei <ko1@a...>
Date: Sun, 8 Jun 2008 03:29:57 +0900 (JST)
Subject: [ruby-changes:5425] Ruby:r16927 (ruby_1_8_6): merge revision(s) 13830:
shyouhei 2008-06-08 03:28:56 +0900 (Sun, 08 Jun 2008) New Revision: 16927 Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/lib/rexml/encodings/SHIFT-JIS.rb branches/ruby_1_8_6/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_6/ChangeLog?r1=16927&r2=16926&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=16927&r2=16926&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/lib/rexml/encodings/SHIFT-JIS.rb?r1=16927&r2=16926&diff_format=u Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 16926) +++ ruby_1_8_6/ChangeLog (revision 16927) @@ -1,3 +1,9 @@ +Sun Jun 8 03:28:53 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:07:19 2008 Nobuyoshi Nakada <nobu@r...> * lib/optparse.rb (OptionParser::Switch::summarize): fix for long form Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 16926) +++ ruby_1_8_6/version.h (revision 16927) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 140 +#define RUBY_PATCHLEVEL 141 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_6/lib/rexml/encodings/SHIFT-JIS.rb =================================================================== --- ruby_1_8_6/lib/rexml/encodings/SHIFT-JIS.rb (revision 16926) +++ ruby_1_8_6/lib/rexml/encodings/SHIFT-JIS.rb (revision 16927) @@ -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/