* numeric.c (flo_to_s): get rid of buffer overflow.

* io.c (appendline): clearerr(3) before raising exception, since
  exception may be captured by rescue. [ruby-talk:77794]


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

1 files changed, 12 insertions, 0 deletions

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index a2d2bf898f..78a869204d 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -1839,10 +1839,17 @@ class TkVariable
     string(value).to_s
   end
 
+<<<<<<< tk.rb
+  def to_symbol
+    value.intern
+  end
+
+=======
   def to_sym
     value.intern
   end
 
+>>>>>>> 1.73
   def inspect
     format "#<TkVariable: %s>", @id
   end
@@ -1853,8 +1860,13 @@ class TkVariable
       self.equal?(other)
     when String
       self.to_s == other
+<<<<<<< tk.rb
+    when Symbol
+      self.to_symbol == other
+=======
     when Symbol
       self.to_sym == other
+>>>>>>> 1.73
     when Integer
       self.to_i == other
     when Float