From: Roger Serwy <roger.serwy@gmail.com>
Date: Mon, 1 Apr 2013 04:28:55 +0000 (-0500)
Subject: #6698: IDLE now opens just an editor window when configured to do so.
X-Git-Tag: v2.7.5~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34d0c66ef2bcfae00beb9f2b14e393cd00f499e4;p=thirdparty%2FPython%2Fcpython.git

#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 561993ce2056..f2c9062c87d2 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -1414,7 +1414,7 @@ def main():
     global flist, root, use_subprocess
 
     use_subprocess = True
-    enable_shell = True
+    enable_shell = False
     enable_edit = False
     debug = False
     cmd = None
@@ -1435,7 +1435,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()
@@ -1486,6 +1485,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 29784ffa9e47..70dd410c2436 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,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.