merge revision(s) 49034: [Backport #10662]

	* ext/tk/lib/tkextlib/tcllib/plotchart.rb: fix to invoke correct function
	  of tcllib. Patch by @zalt50 [fix GH-787]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 86e9666ae5..a0429eda77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 31 14:11:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/tk/lib/tkextlib/tcllib/plotchart.rb: fix to invoke correct function
+	  of tcllib. Patch by @zalt50 [fix GH-787]
+
 Wed Dec 31 13:26:22 2014  Eric Wong  <e@80x24.org>
 
 	* vm_core.h (rb_vm_living_threads_insert): preserve order
diff --git a/ext/tk/lib/tkextlib/tcllib/plotchart.rb b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
index d2f3a0da3a..a1ebe86692 100644
--- a/ext/tk/lib/tkextlib/tcllib/plotchart.rb
+++ b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
@@ -142,7 +142,7 @@ module Tk::Tcllib::Plotchart
   end
 
   def self.pixel_to_coords(w, x, y)
-    list(tk_call_without_enc('::Plotchart::coordsToPixel', w.path, x, y))
+    list(tk_call_without_enc('::Plotchart::pixelToCoords', w.path, x, y))
   end
 
   def self.determine_scale(*args) # (xmin, xmax, inverted=false)
@@ -311,7 +311,7 @@ module Tk::Tcllib::Plotchart
     end
 
     def pixel_to_coords(x, y)
-      list(tk_call_without_enc('::Plotchart::coordsToPixel', @path, x, y))
+      list(tk_call_without_enc('::Plotchart::pixelToCoords', @path, x, y))
     end
 
     def determine_scale(xmax, ymax)
diff --git a/version.h b/version.h
index 6b4b68930f..1b6bb21f0f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2014-12-31"
-#define RUBY_PATCHLEVEL 2
+#define RUBY_PATCHLEVEL 3
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 12