yugui	2010-11-15 20:43:34 +0900 (Mon, 15 Nov 2010)

  New Revision: 29793

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29793

  Log:
    merges r29234 from trunk into ruby_1_9_2.
    --
    * lib/date.rb: [ruby-core:32096]  Thanks Colin Bartlett.

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

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29792)
+++ ruby_1_9_2/ChangeLog	(revision 29793)
@@ -1,3 +1,7 @@
+Sun Sep 12 21:21:50 2010  Tadayoshi Funaba  <tadf@d...>
+
+	* lib/date.rb: [ruby-core:32096]  Thanks Colin Bartlett.
+
 Tue Nov  2 21:33:43 2010  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* hash.c (ruby_setenv): merged r29225 but just warning
Index: ruby_1_9_2/lib/date.rb
===================================================================
--- ruby_1_9_2/lib/date.rb	(revision 29792)
+++ ruby_1_9_2/lib/date.rb	(revision 29793)
@@ -589,7 +589,7 @@
     # +sg+ specifies the Day of Calendar Reform.
     def _valid_ordinal? (y, d, sg=GREGORIAN) # :nodoc:
       if d < 0
-	j = find_ldoy(y, sg)
+	return unless j = find_ldoy(y, sg)
 	ny, nd = jd_to_ordinal(j + d + 1, sg)
 	return unless ny == y
 	d = nd
@@ -616,7 +616,7 @@
 	m += 13
       end
       if d < 0
-	j = find_ldom(y, m, sg)
+	return unless j = find_ldom(y, m, sg)
 	ny, nm, nd = jd_to_civil(j + d + 1, sg)
 	return unless [ny, nm] == [y, m]
 	d = nd
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29792)
+++ ruby_1_9_2/version.h	(revision 29793)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 37
+#define RUBY_PATCHLEVEL 38
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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