diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:47:28 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:47:28 +0000 |
commit | b8755b044e2c66baaaea28d981f192cbc53017e7 (patch) | |
tree | b30c035509c038b3a94a12c80f8949da9c8cef0f | |
parent | 2bdd8561e604f9dd5c83bca0e6014720cb397592 (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/tk/lib/tk/variable.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -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) @@ -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 |