diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rexml/encodings/SHIFT-JIS.rb | 4 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Wed Nov 7 03:32:38 2007 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] + Tue Nov 6 16:37:47 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval_load.c (loaded_feature_path): need to expand relative paths. 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) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-11-06" +#define RUBY_RELEASE_DATE "2007-11-07" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20071106 +#define RUBY_RELEASE_CODE 20071107 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_DAY 7 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |