shyouhei	2008-06-08 06:04:24 +0900 (Sun, 08 Jun 2008)

  New Revision: 17008

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/time.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 14883:
    * time.c (time_arg): use converted object.  [ruby-core:14759]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/time.c?r1=17008&r2=17007&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17008&r2=17007&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17008&r2=17007&diff_format=u

Index: ruby_1_8_5/time.c
===================================================================
--- ruby_1_8_5/time.c	(revision 17007)
+++ ruby_1_8_5/time.c	(revision 17008)
@@ -349,7 +349,7 @@
 	    tm->tm_mon = -1;
 	    for (i=0; i<12; i++) {
 		if (RSTRING(s)->len == 3 &&
-		    strcasecmp(months[i], RSTRING(v[1])->ptr) == 0) {
+		    strcasecmp(months[i], RSTRING(s)->ptr) == 0) {
 		    tm->tm_mon = i;
 		    break;
 		}
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17007)
+++ ruby_1_8_5/ChangeLog	(revision 17008)
@@ -1,3 +1,7 @@
+Sun Jun  8 06:03:45 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* time.c (time_arg): use converted object.  [ruby-core:14759]
+
 Sun Jun  8 06:01:25 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (fptr_finalize): clear errno first.  [ruby-talk:284492]
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17007)
+++ ruby_1_8_5/version.h	(revision 17008)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 163
+#define RUBY_PATCHLEVEL 164
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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