diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-25 08:33:15 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-25 08:33:15 +0000 |
commit | d849db29b09e9cef039c5b4980d0417df94ae476 (patch) | |
tree | 8076f0c0ad585518b8e52ae7ddc103b1a9eb7fae | |
parent | bf524be10c1fbc28e59d11d17fc7147f53129cb5 (diff) |
merge revision(s) 53022: [Backport #11764]
* ext/tk/lib/multi-tk.rb: fix typos.
[Bug #11764][ruby-core:71800]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53921 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/tk/lib/multi-tk.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Thu Feb 25 17:32:23 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * ext/tk/lib/multi-tk.rb: fix typos. + [Bug #11764][ruby-core:71800] + Thu Feb 25 16:46:37 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * re.c (reg_names_iter): should consider encoding of regexp. diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb index 68bd849670..67e29eb054 100644 --- a/ext/tk/lib/multi-tk.rb +++ b/ext/tk/lib/multi-tk.rb @@ -1490,17 +1490,17 @@ class MultiTkIp begin @interp._eval("::safe::disallowTk #{slave}") rescue - warn("Waring: fail to call '::safe::disallowTk'") if $DEBUG + warn("Warning: fail to call '::safe::disallowTk'") if $DEBUG end else # toplevel path begin @interp._eval("::safe::tkDelete {} #{top} #{slave}") rescue - warn("Waring: fail to call '::safe::tkDelete'") if $DEBUG + warn("Warning: fail to call '::safe::tkDelete'") if $DEBUG begin @interp._eval("destroy #{top}") rescue - warn("Waring: fail to destroy toplevel") if $DEBUG + warn("Warning: fail to destroy toplevel") if $DEBUG end end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.9" #define RUBY_RELEASE_DATE "2016-02-25" -#define RUBY_PATCHLEVEL 442 +#define RUBY_PATCHLEVEL 443 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 2 |