mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 20:31:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge heads

Browse source
This commit is contained in:
Benjamin Peterson 2011-03-25 16:58:31 -05:00
commit d480d93f61
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/idlelib/EditorWindow.py
View file

@ -310,10 +310,10 @@ class EditorWindow(object):
if (event.state & 4) != 0 and event.keysym == "Home": if (event.state & 4) != 0 and event.keysym == "Home":
# state&4==Control. If <Control-Home>, use the Tk binding. # state&4==Control. If <Control-Home>, use the Tk binding.
return return
if self.text.index("iomark") and \ if self.text.index("iomark") and \
self.text.compare("iomark", "<=", "insert lineend") and \ self.text.compare("iomark", "<=", "insert lineend") and \
self.text.compare("insert linestart", "<=", "iomark"): self.text.compare("insert linestart", "<=", "iomark"):
# In Shell on input line, go to just after prompt
insertpt = int(self.text.index("iomark").split(".")[1]) insertpt = int(self.text.index("iomark").split(".")[1])
else: else:
line = self.text.get("insert linestart", "insert lineend") line = self.text.get("insert linestart", "insert lineend")
@ -322,30 +322,27 @@ class EditorWindow(object):
break break
else: else:
insertpt=len(line) insertpt=len(line)
lineat = int(self.text.index("insert").split('.')[1]) lineat = int(self.text.index("insert").split('.')[1])
if insertpt == lineat: if insertpt == lineat:
insertpt = 0 insertpt = 0
dest = "insert linestart+"+str(insertpt)+"c" dest = "insert linestart+"+str(insertpt)+"c"
if (event.state&1) == 0: if (event.state&1) == 0:
# shift not pressed # shift was not pressed
self.text.tag_remove("sel", "1.0", "end") self.text.tag_remove("sel", "1.0", "end")
else: else:
if not self.text.index("sel.first"): if not self.text.index("sel.first"):
self.text.mark_set("anchor","insert") self.text.mark_set("my_anchor", "insert") # there was no previous selection
else:
if self.text.compare(self.text.index("sel.first"), "<", self.text.index("insert")):
self.text.mark_set("my_anchor", "sel.first") # extend back
else:
self.text.mark_set("my_anchor", "sel.last") # extend forward
first = self.text.index(dest) first = self.text.index(dest)
last = self.text.index("anchor") last = self.text.index("my_anchor")
if self.text.compare(first,">",last): if self.text.compare(first,">",last):
first,last = last,first first,last = last,first
self.text.tag_remove("sel", "1.0", "end") self.text.tag_remove("sel", "1.0", "end")
self.text.tag_add("sel", first, last) self.text.tag_add("sel", first, last)
self.text.mark_set("insert", dest) self.text.mark_set("insert", dest)
self.text.see("insert") self.text.see("insert")
return "break" return "break"

3
Lib/idlelib/NEWS.txt
View file

@ -3,8 +3,11 @@ What's New in IDLE 2.7.2?
*Release date: XX-XX-XXXX* *Release date: XX-XX-XXXX*
- <Home> toggle failing on Tk 8.5, causing IDLE exits and strange selection
behavior. Issue 4676. Improve selection extension behaviour.
- <Home> toggle non-functional when NumLock set on Windows. Issue 3851. - <Home> toggle non-functional when NumLock set on Windows. Issue 3851.
What's New in IDLE 2.7? What's New in IDLE 2.7?
======================= =======================