From 5e808b6ba38dbd974b617e80e2cf054eaaca604f Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 25 Feb 2012 12:25:55 +0000 Subject: merge revision(s) 34794,34795: * dir.c (dir_initialize): keep path in original encoding. * error.c (syserr_initialize): prefer the encoding of message over locale. [ruby-dev:45279][Bug #6071] * dir.c (dir_inspect), io.c (rb_io_inspect): keep encoding of path. [Bug #6072] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 0764ef42af..66f2a388d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,20 @@ +Sat Feb 25 21:18:12 2012 Nobuyoshi Nakada + + * dir.c (dir_inspect), io.c (rb_io_inspect): keep encoding of path. + [Bug #6072] + +Sat Feb 25 21:18:12 2012 Nobuyoshi Nakada + + * dir.c (dir_initialize): keep path in original encoding. + + * error.c (syserr_initialize): prefer the encoding of message over + locale. [ruby-dev:45279][Bug #6071] + Sat Feb 25 17:10:51 2012 NARUSE, Yui * lib/fileutils.rb: use chomp(?/) instead of sub to optimize and avoid to regexping invalid string. -Sat Feb 25 17:09:53 2012 Nobuyoshi Nakada - - * dir.c (dir_inspect), io.c (rb_io_inspect): keep encoding of path. - [Bug #6072] - Sat Feb 25 16:39:13 2012 NARUSE, Yui * complex.c (nucomp_marshal_load): raise error on invalid data. -- cgit v1.2.3