From b8755b044e2c66baaaea28d981f192cbc53017e7 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 30 Jan 2010 12:47:28 +0000 Subject: 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 --- ext/tk/lib/tk/variable.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext') 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) -- cgit v1.2.3