3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b4c35223a..96253636a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan  1 01:04:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): rejects dummy encoding.
+
 Mon Dec 31 23:53:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (proc_options, process_options): delays finding encoding
diff --git a/ruby.c b/ruby.c
index a47403eb55..bc0fdde4e1 100644
--- a/ruby.c
+++ b/ruby.c
@@ -969,6 +969,9 @@ process_options(VALUE arg)
 	if ((opt->enc_index = rb_enc_find_index(s)) < 0) {
 	    rb_raise(rb_eRuntimeError, "unknown encoding name - %s", s);
 	}
+	else if (rb_enc_dummy_p(rb_enc_from_index(opt->enc_index))) {
+	    rb_raise(rb_eRuntimeError, "dummy encoding is not acceptable - %s ", s);
+	}
     }
     if (opt->e_script) {
 	if (opt->enc_index >= 0)
diff --git a/version.h b/version.h
index 03f3159bff..e744fb3a45 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-12-31"
+#define RUBY_RELEASE_DATE "2008-01-01"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071231
+#define RUBY_RELEASE_CODE 20080101
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 0
-#define RUBY_RELEASE_YEAR 2007
-#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_YEAR 2008
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 1
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];