summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-14 05:11:20 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-14 05:11:20 +0000
commit40c08c9ee611fc5487a453df4e73d15e01135550 (patch)
tree4387231b5097d9dfde58bba65809cede210c7934
parent48a303c0277a8fd7c90fe0fd1cb4f908ab138e03 (diff)
* ruby.c (proc_options): -U can be followed by other options.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ruby.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d02b07cd2..2270d3b3d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 14 14:11:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (proc_options): -U can be followed by other options.
+
Tue Oct 14 13:30:30 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/trans/single_byte.trans: added windows-1252
diff --git a/ruby.c b/ruby.c
index 29085979fa..5420b94aa2 100644
--- a/ruby.c
+++ b/ruby.c
@@ -792,7 +792,8 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
case 'U':
set_internal_encoding_once(opt, "UTF-8", 0);
- break;
+ ++s;
+ goto reswitch;
case 'K':
if (*++s) {