merge 3.2

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

diff --cc Lib/idlelib/NEWS.txt
index 7ea53db2472366b6f404bb606eb2990216c93e41,de9f55d2f7eb790a59603f201ca6e9d7805cd68f..29398e299e95aaa903aebb72d7d609cdd2c0a75f
--- 1/Lib/idlelib/NEWS.txt
--- 2/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -2,12 -2,10 +2,12 @@@ What's New in IDLE 3.3.0
  =========================
  
  - Issue #14937: Perform auto-completion of filenames in strings even for
-   non-ASCII filenames.
+   non-ASCII filenames. Likewise for identifiers.
  
 -What's New in IDLE 3.2.3?
 -=========================
 +- Issue #8515: Set __file__ when run file in IDLE.
 +  Initial patch by Bruce Frederiksen.
 +
 +- IDLE can be launched as `python -m idlelib`
  
  - Issue #14409: IDLE now properly executes commands in the Shell window
    when it cannot read the normal config files on startup and