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.

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

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6656ce2d0e..ca43192020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 13 18:54:25 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* 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@ruby-lang.org>
 
 	* parse.y (parser_magic_comment): fixed normalization.
diff --git a/ext/tk/lib/tk/variable.rb b/ext/tk/lib/tk/variable.rb
index b73a4677da..126832eda4 100644
--- a/ext/tk/lib/tk/variable.rb
+++ b/ext/tk/lib/tk/variable.rb
@@ -1346,7 +1346,7 @@ end
 
     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 @@ end
 
     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)
diff --git a/version.h b/version.h
index 900fb81fc9..035f4e4a09 100644
--- a/version.h
+++ b/version.h
@@ -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