Issue #17532: merge

ned-deily · ned-deily · commit 6a00b6f4fdde · 2013-05-22T15:24:44.000-07:00
diff --git a/Lib/idlelib/Bindings.py b/Lib/idlelib/Bindings.py
@@ -98,6 +98,10 @@
     # 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
@@ -463,7 +463,6 @@ def set_line_and_column(self, event=None):
     ]
 
     if macosxSupport.runningAsOSXApp():
-        del menu_specs[-3]
         menu_specs[-2] = ("windows", "_Window")
 
 
diff --git 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
@@ -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
@@ -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
 -----
 

Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,6 @@ def set_line_and_column(self, event=None):`
`463`	`463`	`]`
`464`	`464`
`465`	`465`	`if macosxSupport.runningAsOSXApp():`
`466`		`- del menu_specs[-3]`
`467`	`466`	`menu_specs[-2] = ("windows", "_Window")`
`468`	`467`
`469`	`468`
Original file line number	Diff line number	Diff line change
`@@ -822,7 +822,6 @@ class PyShell(OutputWindow):`
`822`	`822`	`]`
`823`	`823`
`824`	`824`	`if macosxSupport.runningAsOSXApp():`
`825`		`- del menu_specs[-3]`
`826`	`825`	`menu_specs[-2] = ("windows", "_Window")`
`827`	`826`
`828`	`827`