[Python-checkins] cpython (merge 3.2 -> default): Merge from 3.2

Sun May 15 00:07:14 CEST 2011

http://hg.python.org/cpython/rev/ec3e73a25d84
changeset: 70115:ec3e73a25d84
parent: 70110:9090970d5e17
parent: 70114:c940b17a7020
user: Kurt B. Kaiser <kbk at shore.net>
date: Sat May 14 17:46:44 2011 -0400
summary:
 Merge from 3.2
Issue #6378: Further adjust idle.bat to start associated Python
files:
 Lib/idlelib/NEWS.txt | 4 +++-
 Lib/idlelib/idle.bat | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,8 @@
 
 *Release date: 15-May-11*
 
+- Issue #6378: Further adjust idle.bat to start associated Python
+
 - Issue #11896: Save on Close failed despite selecting "Yes" in dialog.
 
 - Issue #1028: Ctrl-space binding to show completions was causing IDLE to exit.
@@ -63,7 +65,7 @@
 extract port from command line when warnings are present.
 
 - Tk 8.5 Text widget requires 'wordprocessor' tabstyle attr to handle
- mixed space/tab properly. Issue 5120, patch by Guilherme Polo.
+ mixed space/tab properly. Issue 5129, patch by Guilherme Polo.
 
 - Issue #3549: On MacOS the preferences menu was not present
 
diff --git a/Lib/idlelib/idle.bat b/Lib/idlelib/idle.bat
--- a/Lib/idlelib/idle.bat
+++ b/Lib/idlelib/idle.bat
@@ -1,4 +1,4 @@
 @echo off
 rem Start IDLE using the appropriate Python interpreter
 set CURRDIR=%~dp0
-start "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9
+start "IDLE" "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9
-- 
Repository URL: http://hg.python.org/cpython
