pressing <Esc+.> prints the last word of the last command to the command line

susinmotion · susinmotion · commit 861a883b6388 · 2014-09-15T17:27:07.000-04:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -532,24 +532,19 @@ def process_key_event(self, e):
             self.add_normal_character(e)
 
     def get_last_word(self):
-        entry = self.rl_history.entry
 
-        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
+        def last_word(line):
+            if not line:
+                return ''
+            return line.split().pop()
 
-        self._set_cursor_offset(self.cursor_offset+len(last_word))
-        #print len(self.rl_history.entry)
+        previous_word = last_word(self.rl_history.entry)
+        word = last_word(self.rl_history.back())
+        line=self.current_line
+        self._set_current_line(line[:len(line)-len(previous_word)]+word, reset_rl_history=False)
         
-        # self._set_cursor_offset(remember_cursor_offset)
-        # print 'second', self.cursor_offset
+        self._set_cursor_offset(self.cursor_offset-len(previous_word)+len(word), reset_rl_history=False)
+ 
 
     def incremental_search(self, reverse=False, include_current=False):
         if self.special_mode == None:
