From d45acec2070df32d985614ff5767bc1b971cc7f8 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 6 Nov 2007 18:35:33 +0000 Subject: * lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for nkf conversion. a patch from . [ruby-dev:32183] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/rexml/encodings/SHIFT-JIS.rb | 4 ++-- version.h | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 410318f3d..fec49a4c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Nov 7 03:32:38 2007 Yukihiro Matsumoto + + * lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for + nkf conversion. a patch from . + [ruby-dev:32183] + Tue Nov 6 16:37:47 2007 Nobuyoshi Nakada * 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 93c7877af..9e0f4af20 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) diff --git a/version.h b/version.h index 8ff9bc14a..d8db5dabb 100644 --- a/version.h +++ b/version.h @@ -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[]; -- cgit