Merge from 3.1

Lib/idlelib/EditorWindow.py

@@ -303,9 +303,9 @@ class EditorWindow(object):
         return "break"
 
     def home_callback(self, event):
-        if (event.state & 12) != 0 and event.keysym == "Home":
-            # state&1==shift, state&4==control, state&8==alt
-            return # <Modifier-Home>; fall back to class binding
+        if (event.state & 4) != 0 and event.keysym == "Home":
+            # state&4==Control. If <Control-Home>, use the Tk binding.
+            return
 
         if self.text.index("iomark") and \
            self.text.compare("iomark", "<=", "insert lineend") and \

Lib/idlelib/NEWS.txt

@@ -1,4 +1,12 @@
-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: 27-Jun-09*