From: Martin v. Löwis <martin@v.loewis.de>
Date: Tue, 5 May 2009 16:14:30 +0000 (+0000)
Subject: Merged revisions 72335 via svnmerge from
X-Git-Tag: v3.1b1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8482ef97228b5349240d96171ff18a3bb1b43b2f;p=python

Merged revisions 72335 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72335 | martin.v.loewis | 2009-05-05 18:10:16 +0200 (Di, 05 Mai 2009) | 2 lines

  Issue #5847: Remove -n switch on "Edit with IDLE" menu item.
........
---

diff --git a/Misc/NEWS b/Misc/NEWS
index dbd10b283f..b0948100c6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -942,6 +942,8 @@ Tools/Demos
 Build
 -----
 
+- Issue #5847: Remove -n switch on "Edit with IDLE" menu item.
+
 - Issue #5726: Make Modules/ld_so_aix return the actual exit code of the
   linker, rather than always exit successfully. Patch by Floris Bruynooghe.
 
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 4f00db791e..044f3d364a 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1188,10 +1188,10 @@ def add_registry(db):
     if have_tcl:
         tcl_verbs=[
              ("py.IDLE", -1, pat % (testprefix, "", ewi), "",
-              r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"',
+              r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -e "%1"',
               "REGISTRY.tcl"),
              ("pyw.IDLE", -1, pat % (testprefix, "NoCon", ewi), "",
-              r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"',
+              r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -e "%1"',
               "REGISTRY.tcl"),
         ]
     add_data(db, "Registry",