diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 18:28:35 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 18:28:35 +0000 |
| commit | 9a820db0f1a76fee97b3cff575339045d42ecdf2 (patch) | |
| tree | aa6a8e1cfacb468d8e3efaaa72d173403cc7c598 /lib | |
| parent | 0c7a99724f444ce83492d522c36f3f94d617acb3 (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_5@16925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rexml/encodings/SHIFT-JIS.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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) |