IDLE no longer opens only an edit window when configured to do so

Lib/idlelib/PyShell.py

--- a/Lib/idlelib/PyShell.py	Sat Dec 10 17:55:31 2011 -0500
+++ b/Lib/idlelib/PyShell.py	Sat Dec 10 23:42:27 2011 -0600
@@ -1296,7 +1296,7 @@
     global flist, root, use_subprocess
 
     use_subprocess = True
-    enable_shell = True
+    enable_shell = False
     enable_edit = False
     debug = False
     cmd = None
@@ -1317,7 +1317,6 @@
             enable_shell = True
         if o == '-e':
             enable_edit = True
-            enable_shell = False
         if o == '-h':
             sys.stdout.write(usage_msg)
             sys.exit()
@@ -1368,6 +1367,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")