mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	Issue #17532: merge
This commit is contained in:
		
						commit
						6a00b6f4fd
					
				
					 5 changed files with 8 additions and 2 deletions
				
			
		|  | @ -98,6 +98,10 @@ | ||||||
|     # menu |     # menu | ||||||
|     del menudefs[-1][1][0:2] |     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() | default_keydefs = idleConf.GetCurrentKeySet() | ||||||
| 
 | 
 | ||||||
| del sys | del sys | ||||||
|  |  | ||||||
|  | @ -463,7 +463,6 @@ def set_line_and_column(self, event=None): | ||||||
|     ] |     ] | ||||||
| 
 | 
 | ||||||
|     if macosxSupport.runningAsOSXApp(): |     if macosxSupport.runningAsOSXApp(): | ||||||
|         del menu_specs[-3] |  | ||||||
|         menu_specs[-2] = ("windows", "_Window") |         menu_specs[-2] = ("windows", "_Window") | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -822,7 +822,6 @@ class PyShell(OutputWindow): | ||||||
|     ] |     ] | ||||||
| 
 | 
 | ||||||
|     if macosxSupport.runningAsOSXApp(): |     if macosxSupport.runningAsOSXApp(): | ||||||
|         del menu_specs[-3] |  | ||||||
|         menu_specs[-2] = ("windows", "_Window") |         menu_specs[-2] = ("windows", "_Window") | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1154,6 +1154,7 @@ Michael Simcich | ||||||
| Ionel Simionescu | Ionel Simionescu | ||||||
| Kirill Simonov | Kirill Simonov | ||||||
| Nathan Paul Simons | Nathan Paul Simons | ||||||
|  | Guilherme Simões | ||||||
| Adam Simpkins | Adam Simpkins | ||||||
| Ravi Sinha | Ravi Sinha | ||||||
| Janne Sinkkonen | Janne Sinkkonen | ||||||
|  |  | ||||||
|  | @ -370,6 +370,9 @@ IDLE | ||||||
| 
 | 
 | ||||||
| - Issue #14735: Update IDLE docs to omit "Control-z on Windows". | - 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 | Build | ||||||
| ----- | ----- | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Ned Deily
						Ned Deily