history problems.

susinmotion · susinmotion · commit bb81a75ef81a · 2014-09-11T19:38:10.000-04:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -532,14 +532,21 @@ def process_key_event(self, e):
             self.add_normal_character(e)
 
     def get_last_word(self):
-        last_history_entry = self.rl_history.back()
-        print 'last_history_entry', last_history_entry
-        # last_word = last_history_entry.split().pop()
-        # print 'last_word', last_word
+        entry = self.rl_history.entry
 
-        # print 'first', self.cursor_offset
+        self.current_line=self.current_line[:-len(entry)]
+        
+        self._set_cursor_offset(self.cursor_offset-len(entry))
 
+        last_history_entry = self.rl_history.back()
+    
+        last_word = last_history_entry.split().pop()
+ 
+        # print 'first', self.cursor_offset
+        self.current_line=self.current_line+last_word
 
+        self._set_cursor_offset(self.cursor_offset+len(last_word))
+        #print len(self.rl_history.entry)
         
         # self._set_cursor_offset(remember_cursor_offset)
         # print 'second', self.cursor_offset
@@ -828,7 +835,8 @@ def run_code_and_maybe_finish(self, for_code=None):
             if err:
                 indent = 0
 
-            #TODO This should be printed ABOVE the error that just happened instead
+     
+           #TODO This should be printed ABOVE the error that just happened instead
             # or maybe just thrown away and not shown
             if self.current_stdouterr_line:
                 self.display_lines.extend(paint.display_linize(self.current_stdouterr_line, self.width))
