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 dbd10b283f064872d708fbccaa0cc0eaba96ea81..b0948100c6f9a57e243919a79c95c1ee85ace4bc 100644 (file)
--- 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 4f00db791ec77e96ecc4bfb7c7b39dea77d7fe19..044f3d364ae06fbfcaae346898007d25198c72b6 100644 (file)
--- 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",