2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 57081a4a3..a129059be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 22 17:39:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#open): should return a value from the
+	  block (if given).   [ruby-core:18394]
+
 Mon Sep 22 11:17:51 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* include/ruby/encoding.h (enum): ISO C forbids comma at end of
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 5eb294e39..7765026b4 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -187,8 +187,6 @@ class Tempfile < DelegateClass(File)
 	ensure
 	  tempfile.close
 	end
-
-	nil
       else
 	tempfile
       end