diff options
| author | Kurt B. Kaiser <kbk@shore.net> | 2011-03-24 17:19:35 (GMT) |
|---|---|---|
| committer | Kurt B. Kaiser <kbk@shore.net> | 2011-03-24 17:19:35 (GMT) |
| commit | 5cf7878fda141c005c04dde883efd4050cafc9e1 (patch) | |
| tree | 85bcbcf3bb6e7c9bb1eaf67107621fc04765274d | |
| parent | b938c8c25316b69f1d5df2c7880a9f6b87e7c2fa (diff) | |
| parent | f9439914c8359ec42889028f537bbe1dd57c4590 (diff) | |
| download | cpython-5cf7878fda141c005c04dde883efd4050cafc9e1.zip cpython-5cf7878fda141c005c04dde883efd4050cafc9e1.tar.gz cpython-5cf7878fda141c005c04dde883efd4050cafc9e1.tar.bz2 | |
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 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? ========================= |