3 files changed, 7 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b2e3029ff..ff63a59f40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Nov 21 01:04:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (nil_plus): remove unused function.  [ruby-core:13737]
+
 Tue Nov 20 21:46:46 2007  Tanaka Akira  <akr@fsij.org>
 
 	* time.c (time_mload): ignore invalid digits in submicro.
diff --git a/object.c b/object.c
index 0ecb408bae..d0f104cae9 100644
--- a/object.c
+++ b/object.c
@@ -811,27 +811,6 @@ nil_inspect(VALUE obj)
     return rb_str_new2("nil");
 }
 
-#ifdef NIL_PLUS
-static VALUE
-nil_plus(VALUE x, VALUE y)
-{
-    switch (TYPE(y)) {
-      case T_NIL:
-      case T_FIXNUM:
-      case T_FLOAT:
-      case T_BIGNUM:
-      case T_STRING:
-      case T_ARRAY:
-	return y;
-      default:
-	rb_raise(rb_eTypeError, "tried to add %s(%s) to nil",
-		 RSTRING_PTR(rb_inspect(y)),
-		 rb_obj_classname(y));
-    }
-    /* not reached */
-}
-#endif
-
 /***********************************************************************
  *  Document-class: TrueClass
  *
diff --git a/version.h b/version.h
index fd2f91e7f5..25decee31d 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-11-20"
+#define RUBY_RELEASE_DATE "2007-11-21"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071120
+#define RUBY_RELEASE_CODE 20071121
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 21
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];