diff options
| author | Ned Deily <nad@acm.org> | 2013-05-22 15:24:44 -0700 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2013-05-22 15:24:44 -0700 |
| commit | 6a00b6f4fddef79e22d9969ea7e4d4b573f62429 (patch) | |
| tree | f7ee525e99675af7cce9c85135602d769daf0012 | |
| parent | 965efe9e5efdeb53e10f181eb3d872e8f402a9fe (diff) | |
| parent | 7f0882c920a9a3e3c7244f84743170dcf2324843 (diff) | |
| download | cpython-git-6a00b6f4fddef79e22d9969ea7e4d4b573f62429.tar.gz | |
Issue #17532: merge
| -rw-r--r-- | Lib/idlelib/Bindings.py | 4 | ||||
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 1 | ||||
| -rw-r--r-- | Lib/idlelib/PyShell.py | 1 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
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") @@ -1154,6 +1154,7 @@ Michael Simcich Ionel Simionescu Kirill Simonov Nathan Paul Simons +Guilherme Simões Adam Simpkins Ravi Sinha Janne Sinkkonen @@ -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 ----- |