Issue #17532: merge

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

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

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index d56987dfe2a646d9a0b6d43e59d65e7b4bd02ad4,a4e7101e017f028e4b759f30594ea39e08452b90..de8b8cea391e6f788a253ca59c267daa69e89a75
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -345,36 -301,32 +345,39 @@@ Documentatio
  - Issue #6696: add documentation for the Profile objects, and improve
    profile/cProfile docs.  Patch by Tom Pinckney.
  
 -- Issue #17915: Fix interoperability of xml.sax with file objects returned by
 -  codecs.open().
 +Tests
 +-----
  
 -Build
 +- Issue #11995: test_pydoc doesn't import all sys.path modules anymore.
 +
 +C-API
  -----
  
 -- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
 -  4.8.
 +- Issue #17522: Add the PyGILState_Check() API.
  
 -- Issue #17962: Build with OpenSSL 1.0.1e on Windows.
 +- Issue #17327: Add PyDict_SetDefault.
  
 +IDLE
 +----
  
 -What's New in Python 3.3.1?
 -===========================
 +- Issue #14146: Highlight source line while debugging on Windows.
  
 -*Release date: 07-Apr-2013*
 +- Issue #17838: Allow sys.stdin to be reassigned.
  
 -Build
 ------
 +- Issue #13495: Avoid loading the color delegator twice in IDLE.
  
 -- Issue #17550: Fix the --enable-profiling configure switch.
 +- Issue #17798: Allow IDLE to edit new files when specified on command line.
  
 -IDLE
 --------
 +- Issue #14735: Update IDLE docs to omit "Control-z on Windows".
  
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
++- Issue #17532: Always include Options menu for IDLE on OS X.
++  Patch by Guilherme Simões.
++
 +Build
 +-----
 +
 +- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
 +  4.8.
  
  
  What's New in Python 3.3.1 release candidate 1?