naruse	2014-12-31 14:13:11 +0900 (Wed, 31 Dec 2014)

  New Revision: 49080

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49080

  Log:
    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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/tk/lib/tkextlib/tcllib/plotchart.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49079)
+++ ruby_2_2/ChangeLog	(revision 49080)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Dec 31 14:11:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* 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@8...>
 
 	* vm_core.h (rb_vm_living_threads_insert): preserve order
Index: ruby_2_2/ext/tk/lib/tkextlib/tcllib/plotchart.rb
===================================================================
--- ruby_2_2/ext/tk/lib/tkextlib/tcllib/plotchart.rb	(revision 49079)
+++ ruby_2_2/ext/tk/lib/tkextlib/tcllib/plotchart.rb	(revision 49080)
@@ -142,7 +142,7 @@ module Tk::Tcllib::Plotchart https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/tk/lib/tkextlib/tcllib/plotchart.rb#L142
   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 https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/tk/lib/tkextlib/tcllib/plotchart.rb#L311
     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)
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49079)
+++ ruby_2_2/version.h	(revision 49080)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49034


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/