changeset:   94201:af092c1d3747
parent:      94198:2d71d0f954fb
parent:      94200:8c0e5b507794
user:        Ned Deily <nad@acm.org>
date:        Sat Jan 17 21:09:16 2015 -0800
files:       Misc/ACKS Misc/NEWS
description:
Issue #23180: merge from 3.4


diff -r 2d71d0f954fb -r af092c1d3747 Doc/library/idle.rst
--- a/Doc/library/idle.rst	Sat Jan 17 17:33:49 2015 -0800
+++ b/Doc/library/idle.rst	Sat Jan 17 21:09:16 2015 -0800
@@ -258,8 +258,8 @@
    Open a pane at the top of the edit window which shows the block context
    of the code which has scrolled above the top of the window.
 
-Windows menu (Shell and Editor)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Window menu (Shell and Editor)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Zoom Height
    Toggles the window between normal size and maximum height. The initial size
diff -r 2d71d0f954fb -r af092c1d3747 Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py	Sat Jan 17 17:33:49 2015 -0800
+++ b/Lib/idlelib/EditorWindow.py	Sat Jan 17 21:09:16 2015 -0800
@@ -439,13 +439,10 @@
         ("format", "F_ormat"),
         ("run", "_Run"),
         ("options", "_Options"),
-        ("windows", "_Windows"),
+        ("windows", "_Window"),
         ("help", "_Help"),
     ]
 
-    if sys.platform == "darwin":
-        menu_specs[-2] = ("windows", "_Window")
-
 
     def createmenubar(self):
         mbar = self.menubar
diff -r 2d71d0f954fb -r af092c1d3747 Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py	Sat Jan 17 17:33:49 2015 -0800
+++ b/Lib/idlelib/PyShell.py	Sat Jan 17 21:09:16 2015 -0800
@@ -848,13 +848,10 @@
         ("edit", "_Edit"),
         ("debug", "_Debug"),
         ("options", "_Options"),
-        ("windows", "_Windows"),
+        ("windows", "_Window"),
         ("help", "_Help"),
     ]
 
-    if sys.platform == "darwin":
-        menu_specs[-2] = ("windows", "_Window")
-
 
     # New classes
     from idlelib.IdleHistory import History
diff -r 2d71d0f954fb -r af092c1d3747 Lib/idlelib/help.txt
--- a/Lib/idlelib/help.txt	Sat Jan 17 17:33:49 2015 -0800
+++ b/Lib/idlelib/help.txt	Sat Jan 17 21:09:16 2015 -0800
@@ -138,7 +138,7 @@
                                  window. This is not present in the Shell
                                  window only the Editor window.
 
-Windows Menu (Shell and Editor):
+Window Menu (Shell and Editor):
 
         Zoom Height -- Toggles the window between normal size (40x80 initial
         setting) and maximum height.  The initial size is in the Configure
diff -r 2d71d0f954fb -r af092c1d3747 Misc/ACKS
--- a/Misc/ACKS	Sat Jan 17 17:33:49 2015 -0800
+++ b/Misc/ACKS	Sat Jan 17 21:09:16 2015 -0800
@@ -1343,6 +1343,7 @@
 Kalle Svensson
 Andrew Svetlov
 Paul Swartz
+Al Sweigart
 Thenault Sylvain
 Péter Szabó
 John Szakmeister
diff -r 2d71d0f954fb -r af092c1d3747 Misc/NEWS
--- a/Misc/NEWS	Sat Jan 17 17:33:49 2015 -0800
+++ b/Misc/NEWS	Sat Jan 17 21:09:16 2015 -0800
@@ -1374,6 +1374,9 @@
 - Issue #17654: Ensure IDLE menus are customized properly on OS X for
   non-framework builds and for all variants of Tk.
 
+- Issue #23180: Rename IDLE "Windows" menu item to "Window".
+  Patch by Al Sweigart.
+
 Build
 -----