nagachika	2013-06-16 01:55:49 +0900 (Sun, 16 Jun 2013)

  New Revision: 41321

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

  Log:
    merge revision(s) 39733: [Backport #8527]
    
    * insns.def: fix condition.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/insns.def
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41320)
+++ ruby_2_0_0/ChangeLog	(revision 41321)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jun 16 01:32:26 2013  TAKANO Mitsuhiro <tak@n...>
+
+	* insns.def: fix condition.
+
 Sun Jun 16 01:22:35 2013  Eric Hodel  <drbrain@s...>
 
 	* ext/socket/extconf.rb:  Enable RFC 3542 IPV6 socket options for OS X
Index: ruby_2_0_0/insns.def
===================================================================
--- ruby_2_0_0/insns.def	(revision 41320)
+++ ruby_2_0_0/insns.def	(revision 41321)
@@ -866,7 +866,7 @@ trace https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/insns.def#L866
     }
 
     EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* id and klass are resolved at callee */,
-		    (flag & RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN) ? TOPN(0) : Qundef);
+		    (flag & (RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN)) ? TOPN(0) : Qundef);
 }
 
 /**********************************************************/
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41320)
+++ ruby_2_0_0/version.h	(revision 41321)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-06-16"
-#define RUBY_PATCHLEVEL 220
+#define RUBY_PATCHLEVEL 221
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39733


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