Merge branch 'fix-308'

thomasballinger · thomasballinger · commit c7bd67a22858 · 2014-07-27T11:32:24.000-04:00
Conflicts:
	bpython/curtsiesfrontend/repl.py
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -351,21 +351,21 @@ def process_event(self, e):
         elif e in self.rl_char_sequences:
             self.cursor_offset, self.current_line = self.rl_char_sequences[e](self.cursor_offset, self.current_line)
             self.update_completion()
+            self.rl_history.reset()
 
         # readline history commands
         elif e in ("<UP>",) + key_dispatch[self.config.up_one_line_key]:
             self.rl_history.enter(self.current_line)
             self.current_line = self.rl_history.back(False,
                     search=self.config.curtsies_right_arrow_completion)
             self.cursor_offset = len(self.current_line)
-            self.update_completion()
 
         elif e in ("<DOWN>",) + key_dispatch[self.config.down_one_line_key]:
             self.rl_history.enter(self.current_line)
             self.current_line = self.rl_history.forward(False,
                     search=self.config.curtsies_right_arrow_completion)
             self.cursor_offset = len(self.current_line)
-            self.update_completion()
+
         elif e in key_dispatch[self.config.search_key]: #TODO Not Implemented
             pass
         #TODO add rest of history commands
@@ -402,8 +402,10 @@ def process_event(self, e):
             self.update_completion()
         elif e == '<TAB>': # tab
             self.on_tab()
+            self.rl_history.reset()
         elif e in ("<Shift-TAB>",):
             self.on_tab(back=True)
+            self.rl_history.reset()
         elif e in key_dispatch[self.config.undo_key]: #ctrl-r for undo
             self.undo()
             self.update_completion()
@@ -415,6 +417,7 @@ def process_event(self, e):
             g.switch()
         elif e in key_dispatch[self.config.external_editor_key]:
             self.send_session_to_external_editor()
+            self.rl_history.reset()
         elif e in ["<Ctrl-x>"]:
             self.send_current_block_to_external_editor()
         elif e in ["<ESC>"]: #ESC
@@ -424,6 +427,7 @@ def process_event(self, e):
             self.update_completion()
         else:
             self.add_normal_character(e)
+            self.rl_history.reset()
             self.update_completion()
 
     def on_enter(self, insert_into_history=True):
