summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2011-03-17 06:43:21 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2011-03-17 06:43:21 (GMT)
commit5a9a5080cf26712160efa79e932e2eeca59437bc (patch)
treea5243cc783899a445cdb971d6fb96e3fed9b245d
parent2e617307bc530b709279926a122d7d58a0a63566 (diff)
parent020d3d985698aac55383eb1a309fd6d281f58a97 (diff)
downloadcpython-5a9a5080cf26712160efa79e932e2eeca59437bc.zip
cpython-5a9a5080cf26712160efa79e932e2eeca59437bc.tar.gz
cpython-5a9a5080cf26712160efa79e932e2eeca59437bc.tar.bz2
branch merge.
-rw-r--r--Lib/idlelib/EditorWindow.py6
-rw-r--r--Lib/idlelib/NEWS.txt7
2 files changed, 10 insertions, 3 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 999952a..71b768f 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -307,9 +307,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 d32db1e..47ff097 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,3 +1,10 @@
+What's New in IDLE 2.7.2?
+=======================
+
+*Release date: XX-XX-XXXX*
+
+- <Home> toggle non-functional when NumLock set on Windows. Issue3851.
+
What's New in IDLE 2.7?
=======================