Merge with 3.3

This commit is contained in:
Terry Jan Reedy 2013-08-13 19:51:29 -04:00
commit b31e3f7fb8
2 changed files with 35 additions and 15 deletions

View file

@ -1264,7 +1264,7 @@ class PyShell(OutputWindow):
def resetoutput(self):
source = self.text.get("iomark", "end-1c")
if self.history:
self.history.history_store(source)
self.history.store(source)
if self.text.get("end-2c") != "\n":
self.text.insert("end-1c", "\n")
self.text.mark_set("iomark", "end-1c")