diff options
| author | Kurt B. Kaiser <kbk@shore.net> | 2011-03-25 04:22:09 (GMT) |
|---|---|---|
| committer | Kurt B. Kaiser <kbk@shore.net> | 2011-03-25 04:22:09 (GMT) |
| commit | 439dfffaf3223c54ae1c2cdb67da8ccb055dca4c (patch) | |
| tree | 68d05d5915b55ec99e8b156137cbbdb09b3a12fe | |
| parent | c7d28be62f56a9089b1a96b2d46a7041822c5885 (diff) | |
| parent | 01ac8cdc132806f57815822854ba1589b4fc40c3 (diff) | |
| download | cpython-439dfffaf3223c54ae1c2cdb67da8ccb055dca4c.zip cpython-439dfffaf3223c54ae1c2cdb67da8ccb055dca4c.tar.gz cpython-439dfffaf3223c54ae1c2cdb67da8ccb055dca4c.tar.bz2 | |
Merge 3.2 heads
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 6 | ||||
| -rw-r--r-- | Lib/idlelib/NEWS.txt | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index a37cb1d..aeec9bf 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -303,9 +303,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 037b02a..a825dc5 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,4 +1,12 @@ -What's New in IDLE 3.1? +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? ========================= *Release date: 27-Jun-09* |