nagachika	2016-03-28 23:56:42 +0900 (Mon, 28 Mar 2016)

  New Revision: 54317

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

  Log:
    merge revision(s) 54018: [Backport #11886]
    
    * ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
      [Bug #11886] The patch provided by Akira Matsuda.
    
    * ext/tk/sample/*.rb: ditto.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/tk/lib/tk/menubar.rb
    branches/ruby_2_2/ext/tk/sample/menubar1.rb
    branches/ruby_2_2/ext/tk/sample/menubar2.rb
    branches/ruby_2_2/ext/tk/sample/menubar3.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54316)
+++ ruby_2_2/version.h	(revision 54317)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-28"
-#define RUBY_PATCHLEVEL 259
+#define RUBY_PATCHLEVEL 260
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_2/ext/tk/lib/tk/menubar.rb
===================================================================
--- ruby_2_2/ext/tk/lib/tk/menubar.rb	(revision 54316)
+++ ruby_2_2/ext/tk/lib/tk/menubar.rb	(revision 54317)
@@ -76,7 +76,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/tk/lib/tk/menubar.rb#L76
 #                        'tearoff'=>false,
 #                        'foreground'=>'grey40',
 #                        'activeforeground'=>'red',
-#                        'font'=>'Helvetia 12 bold')
+#                        'font'=>'Helvetica 12 bold')
 # menubar.pack('side'=>'top', 'fill'=>'x')
 
 # See tk/menuspce.rb about the format of the menu_spec
Index: ruby_2_2/ext/tk/sample/menubar2.rb
===================================================================
--- ruby_2_2/ext/tk/sample/menubar2.rb	(revision 54316)
+++ ruby_2_2/ext/tk/sample/menubar2.rb	(revision 54317)
@@ -44,12 +44,12 @@ mbar = Tk.root.add_menubar(menu_spec, https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/tk/sample/menubar2.rb#L44
                            'tearoff'=>'false',
                            'foreground'=>'grey40',
                            'activeforeground'=>'red',
-                           'font'=>'Helvetia 12 bold')
+                           'font'=>'Helvetica 12 bold')
 # This (default configure options) is NOT same the following.
 #
 #  mbar = Tk.root.add_menubar(menu_spec)
 #  mbar.configure('foreground'=>'grey40', 'activeforeground'=>'red',
-#                 'font'=>'Helvetia 12 bold')
+#                 'font'=>'Helvetica 12 bold')
 
 TkText.new(:wrap=>'word').pack.insert('1.0', 'Please read the sample source, and check how to override default configure options of menu entries on a menu_spec.')
 
Index: ruby_2_2/ext/tk/sample/menubar1.rb
===================================================================
--- ruby_2_2/ext/tk/sample/menubar1.rb	(revision 54316)
+++ ruby_2_2/ext/tk/sample/menubar1.rb	(revision 54317)
@@ -43,7 +43,7 @@ menubar = TkMenubar.new(nil, menu_spec, https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/tk/sample/menubar1.rb#L43
                        'tearoff'=>false,
                        'foreground'=>'grey40',
                        'activeforeground'=>'red',
-                       'font'=>'Helvetia 12 bold')
+                       'font'=>'Helvetica 12 bold')
 menubar.pack('side'=>'top', 'fill'=>'x')
 
 TkText.new(:wrap=>'word').pack.insert('1.0', 'Please read the sample source, and check how to override default configure options of menu entries on a menu_spec. Maybe, on windows, this menubar does not work properly about keyboard shortcuts. Then, please use "menu" option of root/toplevel widget (see sample/menubar2.rb).')
Index: ruby_2_2/ext/tk/sample/menubar3.rb
===================================================================
--- ruby_2_2/ext/tk/sample/menubar3.rb	(revision 54316)
+++ ruby_2_2/ext/tk/sample/menubar3.rb	(revision 54317)
@@ -62,7 +62,7 @@ menubar = TkMenubar.new(nil, menu_spec, https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/tk/sample/menubar3.rb#L62
                         'tearoff'=>false,
                         'foreground'=>'grey40',
                         'activeforeground'=>'red',
-                        'font'=>'Helvetia 12 bold')
+                        'font'=>'Helvetica 12 bold')
 menubar.pack('side'=>'left', 'fill'=>'y')
 
 TkText.new(:wrap=>'word').pack.insert('1.0', 'This sample script generates "Menu Sidebar".
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54316)
+++ ruby_2_2/ChangeLog	(revision 54317)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Mar 28 23:56:17 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
+	  [Bug #11886] The patch provided by Akira Matsuda.
+
+	* ext/tk/sample/*.rb: ditto.
+
 Mon Mar 28 23:20:12 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/fiddle/test_handle.rb (test_NEXT): use -test-/dln/empty

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


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