summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorKurt B. Kaiser <kbk@shore.net>2011-03-24 16:03:36 (GMT)
committerKurt B. Kaiser <kbk@shore.net>2011-03-24 16:03:36 (GMT)
commitf9439914c8359ec42889028f537bbe1dd57c4590 (patch)
tree4d169bcfa532aa9a7a82ab63314752c1ac713a01 /Lib
parent29943aa120adf77407504ca6421bd13af922c93e (diff)
parent75fc566d0f1c0eb3f1065be61220402d05506ec8 (diff)
downloadcpython-f9439914c8359ec42889028f537bbe1dd57c4590.zip
cpython-f9439914c8359ec42889028f537bbe1dd57c4590.tar.gz
cpython-f9439914c8359ec42889028f537bbe1dd57c4590.tar.bz2
Merge 3.1
Diffstat (limited to 'Lib')
-rw-r--r--Lib/idlelib/EditorWindow.py6
-rw-r--r--Lib/idlelib/NEWS.txt8
2 files changed, 11 insertions, 3 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 173fad9..095bdf3 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -304,9 +304,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 \
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 24629c1..7081d80 100644
--- 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?
=========================