yugui	2011-08-11 09:38:23 +0900 (Thu, 11 Aug 2011)

  New Revision: 32917

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

  Log:
    merges r32283 from trunk into ruby_1_9_2.
    --
    * variable.c (rb_const_get_0): should not look for superclasses if
      the second optional argument is given for #const_get().
      fix [Bug #3422] [Bug #3423]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/variable.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 32916)
+++ ruby_1_9_2/ChangeLog	(revision 32917)
@@ -1,3 +1,9 @@
+Wed Jun 29 13:55:36 2011  Yukihiro Matsumoto  <matz@r...>
+
+	* variable.c (rb_const_get_0): should not look for superclasses if
+	  the second optional argument is given for #const_get().
+	  fix [Bug #3422] [Bug #3423]
+
 Tue Jun 28 21:44:58 2011  Keiju Ishitsuka  <keiju@i...>
 
 	* lib/irb/ruby-lex.rb: recognize '\char' in ruby statement.
Index: ruby_1_9_2/variable.c
===================================================================
--- ruby_1_9_2/variable.c	(revision 32916)
+++ ruby_1_9_2/variable.c	(revision 32917)
@@ -1589,7 +1589,7 @@
 	    }
 	    return value;
 	}
-	if (!recurse && klass != rb_cObject) break;
+	if (!recurse) break;
 	tmp = RCLASS_SUPER(tmp);
     }
     if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) {
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 32916)
+++ ruby_1_9_2/version.h	(revision 32917)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 302
+#define RUBY_PATCHLEVEL 303
 #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/