yugui	2011-05-12 06:23:27 +0900 (Thu, 12 May 2011)

  New Revision: 31511

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

  Log:
    merges r30817 from trunk into ruby_1_9_2.
    --
    * lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of
      Object#tap to restore STDOUT.sync.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/benchmark.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31510)
+++ ruby_1_9_2/ChangeLog	(revision 31511)
@@ -1,3 +1,8 @@
+Mon Feb  7 22:56:16 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of
+	  Object#tap to restore STDOUT.sync.
+
 Sun Feb  6 12:18:25 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (words, qwords): dispatch array events.  based on a
Index: ruby_1_9_2/lib/benchmark.rb
===================================================================
--- ruby_1_9_2/lib/benchmark.rb	(revision 31510)
+++ ruby_1_9_2/lib/benchmark.rb	(revision 31511)
@@ -281,8 +281,9 @@
       list.push [label, res]
     }
 
-    STDOUT.sync = sync
     ary
+  ensure
+    STDOUT.sync = sync unless sync.nil?
   end
 
   #
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31510)
+++ ruby_1_9_2/version.h	(revision 31511)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 195
+#define RUBY_PATCHLEVEL 196
 #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/