shyouhei	2008-06-08 06:00:39 +0900 (Sun, 08 Jun 2008)

  New Revision: 17002

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/lib/date.rb
    branches/ruby_1_8_6/version.h

  Log:
    merge revision(s) 14465:
    * lib/date.rb: don't freeze nil even if 1.8 will not be aware of
      the issue. [ruby-dev:32677]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17002&r2=17001&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17002&r2=17001&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/lib/date.rb?r1=17002&r2=17001&diff_format=u

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17001)
+++ ruby_1_8_6/ChangeLog	(revision 17002)
@@ -1,3 +1,8 @@
+Sun Jun  8 05:59:36 2008  Tadayoshi Funaba  <tadf@d...>
+
+	* lib/date.rb: don't freeze nil even if 1.8 will not be aware of
+	  the issue. [ruby-dev:32677]
+
 Sun Jun  8 05:54:44 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (TIMEZONE_VOID): check whether timezone requires zero
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17001)
+++ ruby_1_8_6/version.h	(revision 17002)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 162
+#define RUBY_PATCHLEVEL 163
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/lib/date.rb
===================================================================
--- ruby_1_8_6/lib/date.rb	(revision 17001)
+++ ruby_1_8_6/lib/date.rb	(revision 17002)
@@ -6,7 +6,7 @@
 # Documentation: William Webber <william@w...>
 #
 #--
-# $Id: date.rb,v 2.30 2006-12-30 21:43:41+09 tadf Exp $
+# $Id: date.rb,v 2.33 2007-12-22 14:41:34+09 tadf Exp $
 #++
 #
 # == Overview
@@ -250,7 +250,7 @@
   ABBR_DAYNAMES = %w(Sun Mon Tue Wed Thu Fri Sat)
 
   [MONTHNAMES, DAYNAMES, ABBR_MONTHNAMES, ABBR_DAYNAMES].each do |xs|
-    xs.each{|x| x.freeze}.freeze
+    xs.each{|x| x.freeze unless x.nil?}.freeze
   end
 
   class Infinity < Numeric # :nodoc:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/