shyouhei	2009-07-15 11:50:57 +0900 (Wed, 15 Jul 2009)

  New Revision: 24114

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

  Log:
    merge revision(s) 23306:
    * file.c (rb_file_join): recursive array has no meaning as path
      name.  [ruby-core:23329]

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

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 24113)
+++ ruby_1_8_7/ChangeLog	(revision 24114)
@@ -1,3 +1,8 @@
+Wed Jul 15 11:40:34 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (rb_file_join): recursive array has no meaning as path
+	  name.  [ruby-core:23329]
+
 Tue Jul 14 19:57:28 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (get_ts): use readtime clock.  [ruby-dev:38354]
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 24113)
+++ ruby_1_8_7/version.h	(revision 24114)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-07-14"
+#define RUBY_RELEASE_DATE "2009-07-15"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090714
-#define RUBY_PATCHLEVEL 183
+#define RUBY_RELEASE_CODE 20090715
+#define RUBY_PATCHLEVEL 184
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 15
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/file.c
===================================================================
--- ruby_1_8_7/file.c	(revision 24113)
+++ ruby_1_8_7/file.c	(revision 24114)
@@ -3124,8 +3124,8 @@
 	  case T_STRING:
 	    break;
 	  case T_ARRAY:
-	    if (rb_inspecting_p(tmp)) {
-		tmp = rb_str_new2("[...]");
+	    if (tmp == ary || rb_inspecting_p(tmp)) {
+		rb_raise(rb_eArgError, "recursive array");
 	    }
 	    else {
 		VALUE args[2];

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