summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-12-13 03:48:30 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-12-13 03:48:30 +0000
commit5504b5c8769826e6dcbea7bca9f37d961ebaf2d8 (patch)
tree5c73943c20cf0f7a1ad864330952224bf66f324e
parent3a7020854d43c4d29ca5cd9013e3af139f378548 (diff)
eban
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ruby.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f3cd1e7a3c..6db986f62c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 13 12:41:27 2000 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ruby.c (proc_options): accept "--^M" for DOS line endings.
+
Tue Dec 12 15:45:42 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (newline_node): cancel newline unification.
diff --git a/ruby.c b/ruby.c
index 83fbc721769..9649b69af48 100644
--- a/ruby.c
+++ b/ruby.c
@@ -576,7 +576,7 @@ proc_options(argc, argv)
goto reswitch;
case '-':
- if (!s[1]) {
+ if (!s[1] || s[1] == '\r' && !s[2]) {
argc--,argv++;
goto switch_end;
}