From 674f4fa2ad1394235db032f8513af0a7b3347067 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Wed, 22 May 2013 15:16:17 -0700
Subject: =?UTF-8?q?Issue=20#17532:=20Always=20include=20Options=20menu=20f?=
 =?UTF-8?q?or=20IDLE=20on=20OS=20X.=20Patch=20by=20Guilherme=20Sim=C3=B5es?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Lib/idlelib/Bindings.py     | 4 ++++
 Lib/idlelib/EditorWindow.py | 1 -
 Lib/idlelib/PyShell.py      | 1 -
 Misc/ACKS                   | 1 +
 Misc/NEWS                   | 3 +++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Lib/idlelib/Bindings.py b/Lib/idlelib/Bindings.py
index ec2720b..fe6e812 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 38cbfcf..7b9b583 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -467,7 +467,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 81af85a..0a77bb5 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -844,7 +844,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 37ed4ce..21a1a49 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -941,6 +941,7 @@ Michael Simcich
 Ionel Simionescu
 Kirill Simonov
 Nathan Paul Simons
+Guilherme Simões
 Ravi Sinha
 Janne Sinkkonen
 Ng Pheng Siong
diff --git a/Misc/NEWS b/Misc/NEWS
index 7a72030..9c472dd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,9 @@ IDLE
 
 - Issue #14146: Highlight source line while debugging on Windows.
 
+- Issue #17532: Always include Options menu for IDLE on OS X.
+  Patch by Guilherme Simões.
+
 Tests
 -----
 
-- 
cgit v0.12