[Python-checkins] cpython (merge default -> default): Merge 3.2

[kurt.kaiser]

http://hg.python.org/cpython/rev/905af7b69bec
changeset:   68911:905af7b69bec
parent:      68897:d944431a2b04
parent:      68910:35c84251cd25
user:        Kurt B. Kaiser <kbk at shore.net>
date:        Thu Mar 24 12:51:10 2011 -0400
summary:
  Merge 3.2

files:
  Lib/idlelib/EditorWindow.py |   6 +++---
  Lib/idlelib/NEWS.txt        |  10 +++++++++-
  2 files changed, 12 insertions(+), 4 deletions(-)


diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -303,9 +303,9 @@
         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 \
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
--- a/Lib/idlelib/NEWS.txt
+++ b/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*

-- 
Repository URL: http://hg.python.org/cpython