eban

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5f3cd1e7a3..6db986f62c 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 83fbc72176..9649b69af4 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;
 	    }