From be36df7f55a073e7fcb677497dfaf3c0bab12278 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 2 Apr 2013 04:13:32 +0000 Subject: merge revision(s) 35112,35121: [Backport #6190] * transcode.c (str_encode_bang, encoded_dup): if nothing was transcoded, just set encoding but leave coderange unchanged as forcee_encoding. [ruby-core:43557][Bug #6190] * transcode.c (documentation for str_encode): Explain that transcoding to the same encoding is a no-op (i.e. no exceptions, no replacements,...). [ruby-core:43557][Bug #6190] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 66b04b1c20..208a834c77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Tue Apr 2 13:13:19 2013 Martin Duerst + + * transcode.c (documentation for str_encode): Explain + that transcoding to the same encoding is a no-op + (i.e. no exceptions, no replacements,...). + [ruby-core:43557][Bug #6190] + +Tue Apr 2 13:13:19 2013 Nobuyoshi Nakada + + * transcode.c (str_encode_bang, encoded_dup): if nothing was + transcoded, just set encoding but leave coderange unchanged as + forcee_encoding. [ruby-core:43557][Bug #6190] + Tue Apr 2 13:07:29 2013 Tanaka Akira * time.c (num_exact): use to_r method only if to_int method is -- cgit v1.2.3