mirror of https://github.com/python/cpython.git
#6698: IDLE now opens just an editor window when configured to do so.
This commit is contained in:
parent
420e2d8e39
commit
c35151cf41
|
@ -1409,7 +1409,7 @@ def main():
|
||||||
global flist, root, use_subprocess
|
global flist, root, use_subprocess
|
||||||
|
|
||||||
use_subprocess = True
|
use_subprocess = True
|
||||||
enable_shell = True
|
enable_shell = False
|
||||||
enable_edit = False
|
enable_edit = False
|
||||||
debug = False
|
debug = False
|
||||||
cmd = None
|
cmd = None
|
||||||
|
@ -1430,7 +1430,6 @@ def main():
|
||||||
enable_shell = True
|
enable_shell = True
|
||||||
if o == '-e':
|
if o == '-e':
|
||||||
enable_edit = True
|
enable_edit = True
|
||||||
enable_shell = False
|
|
||||||
if o == '-h':
|
if o == '-h':
|
||||||
sys.stdout.write(usage_msg)
|
sys.stdout.write(usage_msg)
|
||||||
sys.exit()
|
sys.exit()
|
||||||
|
@ -1481,6 +1480,7 @@ def main():
|
||||||
edit_start = idleConf.GetOption('main', 'General',
|
edit_start = idleConf.GetOption('main', 'General',
|
||||||
'editor-on-startup', type='bool')
|
'editor-on-startup', type='bool')
|
||||||
enable_edit = enable_edit or edit_start
|
enable_edit = enable_edit or edit_start
|
||||||
|
enable_shell = enable_shell or not enable_edit
|
||||||
# start editor and/or shell windows:
|
# start editor and/or shell windows:
|
||||||
root = Tk(className="Idle")
|
root = Tk(className="Idle")
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,8 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #6698: IDLE now opens just an editor window when configured to do so.
|
||||||
|
|
||||||
- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer
|
- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer
|
||||||
raises an exception.
|
raises an exception.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue