nagachika	2015-02-19 19:11:00 +0900 (Thu, 19 Feb 2015)

  New Revision: 49651

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

  Log:
    merge revision(s) r49034: [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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/tk/lib/tkextlib/tcllib/plotchart.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49650)
+++ ruby_2_1/ChangeLog	(revision 49651)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Feb 19 19:10:53 2015  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 Feb 18 00:27:57 2015  Eric Hodel  <drbrain@s...>
 
 	* lib/net/http.rb:  Do not attempt SSL session resumption when the
Index: ruby_2_1/ext/tk/lib/tkextlib/tcllib/plotchart.rb
===================================================================
--- ruby_2_1/ext/tk/lib/tkextlib/tcllib/plotchart.rb	(revision 49650)
+++ ruby_2_1/ext/tk/lib/tkextlib/tcllib/plotchart.rb	(revision 49651)
@@ -142,7 +142,7 @@ module Tk::Tcllib::Plotchart https://github.com/ruby/ruby/blob/trunk/ruby_2_1/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_1/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_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49650)
+++ ruby_2_1/version.h	(revision 49651)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-02-18"
-#define RUBY_PATCHLEVEL 297
+#define RUBY_RELEASE_DATE "2015-02-19"
+#define RUBY_PATCHLEVEL 298
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"
 

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


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