merges r24662 from trunk into ruby_1_9_1. This fixes #3149.

--
* lib/tempfile.rb (Tempfile#unlink): reverted r23494, since the
  usage in RubyInline is considered wrong.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@27598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c21025c876..0bcf37390d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 26 13:48:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#unlink): reverted r23494, since the
+	  usage in RubyInline is considered wrong.
+
 Tue Feb  9 23:48:25 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* ext/bigdecimal/bigdecimal.c (BigDecimal_divide): fix precision too.
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index d4d2112d3c..c1050d8a05 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -137,7 +137,6 @@ class Tempfile < DelegateClass(File)
     # keep this order for thread safeness
     begin
       if File.exist?(@tmpname)
-        closed? or close
         File.unlink(@tmpname)
       end
       @@cleanlist.delete(@tmpname)
diff --git a/version.h b/version.h
index cd926622c2..ec59e7d0bf 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 423
+#define RUBY_PATCHLEVEL 424
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1