#6698: IDLE now opens just an editor window when configured to do so.
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index 78c4004..83449df 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -1409,7 +1409,7 @@
global flist, root, use_subprocess
use_subprocess = True
- enable_shell = True
+ enable_shell = False
enable_edit = False
debug = False
cmd = None
@@ -1430,7 +1430,6 @@
enable_shell = True
if o == '-e':
enable_edit = True
- enable_shell = False
if o == '-h':
sys.stdout.write(usage_msg)
sys.exit()
@@ -1481,6 +1480,7 @@
edit_start = idleConf.GetOption('main', 'General',
'editor-on-startup', type='bool')
enable_edit = enable_edit or edit_start
+ enable_shell = enable_shell or not enable_edit
# start editor and/or shell windows:
root = Tk(className="Idle")
diff --git a/Misc/NEWS b/Misc/NEWS
index a3fe827..e1d6486 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,8 @@
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
raises an exception.