summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-23 16:08:04 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-23 16:08:04 +0000
commitec763d64ca2ebeae182d71b51f6344032e92d4b5 (patch)
tree2cdaefbfbb822e65e164afb276a4cefc948d1293
parentaee5bacd80e6042166c8886ca4d81ab1b811ddff (diff)
downloadruby-ec763d64ca2ebeae182d71b51f6344032e92d4b5.tar.gz
ruby-ec763d64ca2ebeae182d71b51f6344032e92d4b5.tar.xz
ruby-ec763d64ca2ebeae182d71b51f6344032e92d4b5.zip
* ruby.c (proc_optionc): -Kn means ASCII-8BIT.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--ruby.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 220752092..06b87037e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ Thu Jan 24 01:00:34 2008 NARUSE, Yui <naruse@ruby-lang.org>
* parse.y (parser_str_new, rb_intern3): ascii only string literal is
US-ASCII.
+ * ruby.c (proc_optionc): -Kn means ASCII-8BIT.
+
Wed Jan 23 23:54:40 2008 Yusuke Endoh <mame@tsg.ne.jp>
* sprintf.c: fix comment. [ruby-dev:33275]
diff --git a/ruby.c b/ruby.c
index 7ed0eee9b..a0a1a97e3 100644
--- a/ruby.c
+++ b/ruby.c
@@ -719,7 +719,7 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
enc_name = "UTF-8";
break;
case 'N': case 'n': case 'A': case 'a':
- enc_name = "US-ASCII";
+ enc_name = "ASCII-8BIT";
break;
}
if (enc_name) {