Merge from 3.1

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

diff --cc Lib/idlelib/NEWS.txt
index 037b02a3c1dd549e57cb44dbd985ba647ef82838,7081d8020a99ae2b18484874b7df91ecbc13d3d3..a825dc5f9f6e99b1c2b96cc73a4f9f0fcf74ea7b
--- 1/Lib/idlelib/NEWS.txt
--- 2/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -1,7 -1,15 +1,15 @@@
- What's New in IDLE 3.1?
+ What's New in IDLE 3.1.4?
+ =========================
+ 
+ *Release date: XX-XXX-XX*
+ 
+ - <Home> toggle non-functional when NumLock set on Windows.  Issue3851.
+ 
+ 
+ What's New in IDLE 3.1b1?
  =========================
  
 -*Release date: XX-XXX-09*
 +*Release date: 27-Jun-09*
  
  - Use of 'filter' in keybindingDialog.py was causing custom key assignment to
    fail.  Patch 5707 amaury.forgeotdarc.