From 672c9bc5efb267f05e0eb26a59415feb29401b84 Mon Sep 17 00:00:00 2001 From: nagai Date: Tue, 13 Oct 2009 09:55:55 +0000 Subject: * ext/tk/variable.rb: bug fix. additional trace definition changes the option of first trace definition. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/tk/lib/tk/variable.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a1e70bf8..17cf1de80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 13 18:54:25 2009 Hidetoshi NAGAI + + * ext/tk/variable.rb: bug fix. additional trace definition changes the + option of first trace definition. + Tue Oct 13 18:23:17 2009 Nobuyoshi Nakada * parse.y (token_info_push, token_info_pop): reduced ifdefs. diff --git a/ext/tk/lib/tk/variable.rb b/ext/tk/lib/tk/variable.rb index ee60fcfc6..6a618e7ee 100644 --- a/ext/tk/lib/tk/variable.rb +++ b/ext/tk/lib/tk/variable.rb @@ -1375,7 +1375,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) @@ -1421,7 +1421,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