diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index e9a91aed506..bc4a791ed2e 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -258,8 +258,8 @@ Code Context (toggle)(Editor Window only) 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 --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index 7d2ea8f7596..1520ad02311 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -439,13 +439,10 @@ class EditorWindow(object): ("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 --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index 6b439885b27..51aa3f46b88 100755 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -848,13 +848,10 @@ class PyShell(OutputWindow): ("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 --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt index 6378a2e7226..7eff3700405 100644 --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -138,7 +138,7 @@ Options Menu (Shell and Editor): 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 --git a/Misc/ACKS b/Misc/ACKS index 691751a1244..6a023146a42 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1343,6 +1343,7 @@ Hisao Suzuki Kalle Svensson Andrew Svetlov Paul Swartz +Al Sweigart Thenault Sylvain Péter Szabó John Szakmeister diff --git a/Misc/NEWS b/Misc/NEWS index 1e36745fc7d..4fe3ff3af48 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1374,6 +1374,9 @@ IDLE - 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 -----