diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 18:28:56 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 18:28:56 +0000 |
commit | 19638a78663426969452f2dd3f64310abfd95482 (patch) | |
tree | 92928e37a71e07e137bbefa01af3b6e0d1848208 | |
parent | fd0f7b08cb550827355d86e9a26cb4186bb61b8f (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/rexml/encodings/SHIFT-JIS.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Sun Jun 8 03:28:53 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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@ruby-lang.org> * lib/optparse.rb (OptionParser::Switch::summarize): fix for long form diff --git a/lib/rexml/encodings/SHIFT-JIS.rb b/lib/rexml/encodings/SHIFT-JIS.rb index 93c7877afd..9e0f4af20e 100644 --- a/lib/rexml/encodings/SHIFT-JIS.rb +++ b/lib/rexml/encodings/SHIFT-JIS.rb @@ -13,8 +13,8 @@ module REXML rescue LoadError require 'nkf' - SJISTOU8 = '-Swm0' - U8TOSJIS = '-Wsm0' + SJISTOU8 = '-Swm0x' + U8TOSJIS = '-Wsm0x' def decode_sjis(str) NKF.nkf(SJISTOU8, str) @@ -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 |