3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a8ecbd0d1..9dac6de5c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 17 04:52:21 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): -W should be allowed in RUBYOPT
+	  environment variable.  [ruby-core:12118]
+
 Mon Sep 17 04:37:10 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* range.c (range_step): fixed integer overflow.  [ruby-dev:31763]
diff --git a/ruby.c b/ruby.c
index 5d544e7cad..bb7a9d0cda 100644
--- a/ruby.c
+++ b/ruby.c
@@ -775,7 +775,7 @@ proc_options(argc, argv)
 		    }
 		}
 		if (!*s) break;
-		if (!strchr("IdvwrK", *s))
+		if (!strchr("IdvwWrK", *s))
 		    rb_raise(rb_eRuntimeError, "illegal switch in RUBYOPT: -%c", *s);
 		s = moreswitches(s);
 	    }
diff --git a/version.h b/version.h
index fe3700c037..8d0e635d4c 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-09-17"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070917
-#define RUBY_PATCHLEVEL 102
+#define RUBY_PATCHLEVEL 103
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8