#6698: merge with 3.3.

diff --cc Lib/idlelib/PyShell.py
Simple merge

diff --cc Misc/NEWS
index c4b0b1b41fa4d4a57137edda155042fff32fd3de,e1d6486929194978a4b5c9845e7a0ec0bd7d8a41..0dcbca2fe2a884ed1ceb6287dfb1d905137e72e7
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -297,24 -221,8 +297,26 @@@ Core and Builtin
  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.
 +
 +- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo.
 +
 +- Issue #17435: threading.Timer's __init__ method no longer uses mutable
 +  default values for the args and kwargs parameters.
 +
 +- Issue #17526: fix an IndexError raised while passing code without filename to
 +  inspect.findsource().  Initial patch by Tyler Doyle.
 +
  - Issue #17540: Added style to formatter configuration by dict.
  
 +- Issue #16692: The ssl module now supports TLS 1.1 and TLS 1.2.  Initial
 +  patch by Michele Orrù.
 +
 +- Issue #17025: multiprocessing: Reduce Queue and SimpleQueue contention.
 +
  - Issue #17536: Add to webbrowser's browser list: www-browser, x-www-browser,
    iceweasel, iceape.