diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:40:25 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:40:25 +0000 |
| commit | b3f0ef089710b27e2b22921f732190f0e05e11b2 (patch) | |
| tree | 963c7273610a3e183de840cf26f5d2dddee6f85b /test/ruby/test_io_m17n.rb | |
| parent | 2e6152269e37b108c7b90bc1e74445ac3fca083c (diff) | |
merges r25883 from trunk into ruby_1_9_1. fixes a backpor task #2168.
--
* enc/trans/newline.trans (fun_so_universal_newline): generate \n
after \r\n detection instead of just after \r.
[ruby-list:45988] [ruby-core:25881] [ruby-core:26788]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@26015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_io_m17n.rb')
| -rw-r--r-- | test/ruby/test_io_m17n.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb index 71299181e..ac0645344 100644 --- a/test/ruby/test_io_m17n.rb +++ b/test/ruby/test_io_m17n.rb @@ -1506,7 +1506,6 @@ EOT assert_equal("a", f.getc) assert_equal("\n", f.getc) f.binmode - assert_equal("\n", f.getc) assert_equal("b", f.getc) assert_equal("\r", f.getc) assert_equal("\n", f.getc) @@ -1526,7 +1525,6 @@ EOT assert_equal("a", f.getc) assert_equal("\n", f.getc) f.binmode - assert_equal("\n", f.getc) assert_equal("b", f.getc) assert_equal("\r", f.getc) assert_equal("\n", f.getc) |