shyouhei	2009-02-05 08:55:33 +0900 (Thu, 05 Feb 2009)

  New Revision: 22058

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

  Log:
    merge revision(s) 20103:
    * array.c (rb_ary_join): do not repeat self in a recursive array.
      [ruby-dev:37019]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/array.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/array.c
===================================================================
--- ruby_1_8_7/array.c	(revision 22057)
+++ ruby_1_8_7/array.c	(revision 22058)
@@ -1405,7 +1405,7 @@
 	  case T_STRING:
 	    break;
 	  case T_ARRAY:
-	    if (rb_inspecting_p(tmp)) {
+	    if (tmp == ary || rb_inspecting_p(tmp)) {
 		tmp = rb_str_new2("[...]");
 	    }
 	    else {
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22057)
+++ ruby_1_8_7/ChangeLog	(revision 22058)
@@ -1,3 +1,8 @@
+Thu Feb  5 08:55:24 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* array.c (rb_ary_join): do not repeat self in a recursive array.
+	  [ruby-dev:37019]
+
 Wed Feb  4 14:26:58 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* dir.c (dir_globs): need taint check.  reported by steve
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22057)
+++ ruby_1_8_7/version.h	(revision 22058)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-02-04"
+#define RUBY_RELEASE_DATE "2009-02-05"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090204
-#define RUBY_PATCHLEVEL 105
+#define RUBY_RELEASE_CODE 20090205
+#define RUBY_PATCHLEVEL 106
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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