From c35151cf41eda485e40aadabbbfd61822bb157e8 Mon Sep 17 00:00:00 2001
From: Roger Serwy <roger.serwy@gmail.com>
Date: Sun, 31 Mar 2013 23:28:55 -0500
Subject: [PATCH] #6698: IDLE now opens just an editor window when configured
 to do so.

---
 Lib/idlelib/PyShell.py | 4 ++--
 Misc/NEWS              | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index 78c4004fdaf..83449df75df 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -1409,7 +1409,7 @@ def main():
     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 @@ def main():
             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 @@ def main():
     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 a3fe827546c..e1d64869291 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,8 @@ Core and Builtins
 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.