summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/idlelib/Bindings.py4
-rw-r--r--Lib/idlelib/EditorWindow.py1
-rw-r--r--Lib/idlelib/PyShell.py1
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
5 files changed, 8 insertions, 2 deletions
diff --git a/Lib/idlelib/Bindings.py b/Lib/idlelib/Bindings.py
index ec2720b0d0..fe6e812d2b 100644
--- a/Lib/idlelib/Bindings.py
+++ b/Lib/idlelib/Bindings.py
@@ -98,6 +98,10 @@ if macosxSupport.runningAsOSXApp():
# menu
del menudefs[-1][1][0:2]
+ # Remove the 'Configure' entry from the options menu, it is in the
+ # application menu as 'Preferences'
+ del menudefs[-2][1][0:2]
+
default_keydefs = idleConf.GetCurrentKeySet()
del sys
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 7255a44702..6bb5301e03 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -463,7 +463,6 @@ class EditorWindow(object):
]
if macosxSupport.runningAsOSXApp():
- del menu_specs[-3]
menu_specs[-2] = ("windows", "_Window")
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index 9b3fdf4aef..4e1922663c 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -822,7 +822,6 @@ class PyShell(OutputWindow):
]
if macosxSupport.runningAsOSXApp():
- del menu_specs[-3]
menu_specs[-2] = ("windows", "_Window")
diff --git a/Misc/ACKS b/Misc/ACKS
index d51af51943..578c59df9e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1154,6 +1154,7 @@ Michael Simcich
Ionel Simionescu
Kirill Simonov
Nathan Paul Simons
+Guilherme Simões
Adam Simpkins
Ravi Sinha
Janne Sinkkonen
diff --git a/Misc/NEWS b/Misc/NEWS
index d56987dfe2..de8b8cea39 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -370,6 +370,9 @@ IDLE
- Issue #14735: Update IDLE docs to omit "Control-z on Windows".
+- Issue #17532: Always include Options menu for IDLE on OS X.
+ Patch by Guilherme Simões.
+
Build
-----