* parse.y (string_content): turn off NODE_NEWLINE flag to avoid

  unnecessary line trace for inlined expression.
  (ruby-bugs PR#1320)

* numeric.c (flo_to_s): tweak output string based to preserve
  decimal point and to remove trailing zeros.  [ruby-talk:97891]

* string.c (rb_str_index_m): use unsigned comparison for T_FIXNUM
  search.  [ruby-talk:97342]

* hash.c (rb_hash_equal): returns true if two hashes have same set
  of key-value set.  [ruby-talk:97559]

* hash.c (rb_hash_eql): returns true if two hashes are equal and
  have same default values.

* string.c (rb_str_equal): always returns true or false, never
  returns nil. [ruby-dev:23404]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 31 insertions, 16 deletions

diff --git a/lib/delegate.rb b/lib/delegate.rb
index 6e2637393..60d3afe15 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -87,20 +87,27 @@ def DelegateClass(superclass)
   methods = superclass.public_instance_methods(true)
   methods -= ::Kernel.public_instance_methods(false)
   methods |= ["to_s","to_a","inspect","==","=~","==="]
-  klass.module_eval <<-EOS
-  def initialize(obj)
-    @_dc_obj = obj
-  end
-  def __getobj__
-    @_dc_obj
-  end
-  def __setobj__(obj)
-    @_dc_obj = obj
-  end
-  EOS
+  klass.module_eval {
+    def initialize(obj)
+      @_dc_obj = obj
+    end
+    def method_missing(m, *args)
+      p [m, *args]
+      unless @_dc_obj.respond_to?(m)
+        super(m, *args)
+      end
+      @_dc_obj.__send__(m, *args)
+    end
+    def __getobj__
+      @_dc_obj
+    end
+    def __setobj__(obj)
+      @_dc_obj = obj
+    end
+  }
   for method in methods
     begin
-      klass.module_eval <<-EOS
+      klass.module_eval <<-EOS, __FILE__, __LINE__+1
         def #{method}(*args, &block)
 	  begin
 	    @_dc_obj.__send__(:#{method}, *args, &block)
diff --git a/lib/logger.rb b/lib/logger.rb
index 988ea24f1..363e9774b 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -539,6 +539,7 @@ private
 
     def create_logfile(filename)
       logdev = open(filename, (File::WRONLY | File::APPEND | File::CREAT))
+      logdev.sync = true
       add_log_header(logdev)
       logdev
     end
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 084500981..bfb677f22 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -3195,7 +3195,8 @@ EOF
   end
 
   parser = GetoptLong.new
-  parser.set_options(['--help', GetoptLong::NO_ARGUMENT],
+  parser.set_options(['--debug', GetoptLong::NO_ARGUMENT],
+  		     ['--help', GetoptLong::NO_ARGUMENT],
 		     ['--port', GetoptLong::REQUIRED_ARGUMENT],
 		     ['--user', GetoptLong::REQUIRED_ARGUMENT],
 		     ['--auth', GetoptLong::REQUIRED_ARGUMENT])
@@ -3208,6 +3209,8 @@ EOF
 	$user = arg
       when "--auth"
 	$auth = arg
+      when "--debug"
+	Net::IMAP.debug = true
       when "--help"
 	usage
 	exit(1)
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 38a72e125..933350517 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -108,9 +108,13 @@ class Tempfile < DelegateClass(File)
   # file.
   def unlink
     # keep this order for thread safeness
-    File.unlink(@tmpname) if File.exist?(@tmpname)
-    @@cleanlist.delete(@tmpname)
-    @tmpname = nil
+    begin
+      File.unlink(@tmpname) if File.exist?(@tmpname)
+      @@cleanlist.delete(@tmpname)
+      @tmpname = nil
+    rescue Errno::EACCESS
+      # may not be able to unlink on Windows; just ignore
+    end
   end
   alias delete unlink