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

Fri Mar 25 05:33:22 CET 2011

http://hg.python.org/cpython/rev/503be06d110b
changeset: 68918:503be06d110b
branch: 3.1
parent: 68898:37ba11d806c5
parent: 68917:fcc280d471de
user: Kurt B. Kaiser <kbk at shore.net>
date: Thu Mar 24 13:19:35 2011 -0400
summary:
 Merge 3.1
files:
 Lib/idlelib/EditorWindow.py | 6 +++---
 Lib/idlelib/NEWS.txt | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -304,9 +304,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,3 +1,11 @@
+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?
 =========================
 
-- 
Repository URL: http://hg.python.org/cpython
