diff options
| author | Kurt B. Kaiser <kbk@shore.net> | 2011-03-24 12:03:36 -0400 |
|---|---|---|
| committer | Kurt B. Kaiser <kbk@shore.net> | 2011-03-24 12:03:36 -0400 |
| commit | f9439914c8359ec42889028f537bbe1dd57c4590 (patch) | |
| tree | 4d169bcfa532aa9a7a82ab63314752c1ac713a01 | |
| parent | 29943aa120adf77407504ca6421bd13af922c93e (diff) | |
| parent | 75fc566d0f1c0eb3f1065be61220402d05506ec8 (diff) | |
| download | cpython-git-f9439914c8359ec42889028f537bbe1dd57c4590.tar.gz | |
Merge 3.1
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 6 | ||||
| -rw-r--r-- | Lib/idlelib/NEWS.txt | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index 173fad9eb3..095bdf31a6 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 24629c1ede..7081d8020a 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? ========================= |