yugui	2010-01-30 21:47:28 +0900 (Sat, 30 Jan 2010)

  New Revision: 26484

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

  Log:
    merges r25320 from trunk into ruby_1_9_1.
    --
    * ext/tk/variable.rb: bug fix. additional trace definition changes the
      option of first trace definition.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/tk/lib/tk/variable.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 26483)
+++ ruby_1_9_1/ChangeLog	(revision 26484)
@@ -1,3 +1,8 @@
+Tue Oct 13 18:54:25 2009  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/variable.rb: bug fix. additional trace definition changes the
+	  option of first trace definition.
+
 Tue Oct 13 18:20:57 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (parser_magic_comment): fixed normalization.
Index: ruby_1_9_1/ext/tk/lib/tk/variable.rb
===================================================================
--- ruby_1_9_1/ext/tk/lib/tk/variable.rb	(revision 26483)
+++ ruby_1_9_1/ext/tk/lib/tk/variable.rb	(revision 26484)
@@ -1346,7 +1346,7 @@
 
     if @trace_opts == nil
       TkVar_CB_TBL[@id] = self
-      @trace_opts = opts
+      @trace_opts = opts.dup
       if USE_OLD_TRACE_OPTION_STYLE
         Tk.tk_call_without_enc('trace', 'variable', 
                                @id, @trace_opts, 'rb_var ' << @id)
@@ -1392,7 +1392,7 @@
 
     if @trace_opts == nil
       TkVar_CB_TBL[@id] = self
-      @trace_opts = opts
+      @trace_opts = opts.dup
       if USE_OLD_TRACE_OPTION_STYLE
         Tk.tk_call_without_enc('trace', 'add', 'variable', 
                                @id, @trace_opts, 'rb_var ' << @id)
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26483)
+++ ruby_1_9_1/version.h	(revision 26484)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 389
+#define RUBY_PATCHLEVEL 390
 #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/