merge revision(s) 54021: [Backport ruby#11891]

unak · unak · commit f73e2f532147 · 2016-03-25T09:34:26.000Z
* ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo. [ruby-core:72511] [Bug ruby#11891] The patch provided by Akira Matsuda. [ruby-core:72510] [Bug ruby#11890] The patch provided by Akira Matsuda. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,13 @@
+Fri Mar 25 18:34:20 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo.
+	  [ruby-core:72511] [Bug #11891] The patch provided by Akira Matsuda.
+
+
 Fri Mar 25 18:33:34 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
 	* ext/tk/lib/tkextlib/blt/tree.rb: fix method name typo.
-	[ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.
+	  [ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.
 
 
 Fri Mar 25 18:32:44 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
diff --git a/ext/tk/lib/tkextlib/tcllib/toolbar.rb b/ext/tk/lib/tkextlib/tcllib/toolbar.rb
@@ -56,7 +56,7 @@ def ToolbarItem.id2obj(tbar, id)
     }
   end
 
-  def initaialize(parent, *args)
+  def initialize(parent, *args)
     @parent = @t = parent
     @tpath = parent.path
 
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.9"
 #define RUBY_RELEASE_DATE "2016-03-25"
-#define RUBY_PATCHLEVEL 477
+#define RUBY_PATCHLEVEL 478
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ def ToolbarItem.id2obj(tbar, id)`
`56`	`56`	`}`
`57`	`57`	`end`
`58`	`58`
`59`		`- def initaialize(parent, *args)`
	`59`	`+ def initialize(parent, *args)`
`60`	`60`	`@parent = @t = parent`
`61`	`61`	`@tpath = parent.path`
`62`	`62`