summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-09 15:03:54 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-09 15:03:54 +0000
commit292d9610f5af42aa710295555f274d88314301b4 (patch)
tree32cf125744a76b42571a516d5b7fb9d2c22b4f5b
parent6afaff752b6e5e88ebb745ca5a1e72d5c2bc10cf (diff)
* test/ruby/test_io_m17n.rb (test_io_new_enc): "sjis" is now an alias
of Windows-31J. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_io_m17n.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 84dbdf41b5..e0f690d2bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 9 23:51:26 2011 CHIKANAGA Tomoyuki <[email protected]>
+
+ * test/ruby/test_io_m17n.rb (test_io_new_enc): "sjis" is now an alias
+ of Windows-31J.
+
Wed Mar 9 23:06:13 2011 Nobuyoshi Nakada <[email protected]>
* misc/ruby-mode.el (ruby-parse-partial): fix indent after aref.
diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb
index a51c83258f..db1fe0b539 100644
--- a/test/ruby/test_io_m17n.rb
+++ b/test/ruby/test_io_m17n.rb
@@ -281,7 +281,7 @@ EOT
fd = IO.sysopen("tmp")
f = IO.new(fd, "r:sjis")
begin
- assert_equal(Encoding::Shift_JIS, f.read.encoding)
+ assert_equal(Encoding::Windows_31J, f.read.encoding)
ensure
f.close
end