Merge branch 'ctrl-e'

thomasballinger · thomasballinger · commit d2287ad5bae3 · 2015-03-13T13:06:47.000-04:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -594,12 +594,14 @@ def process_key_event(self, e):
         if self.stdin.has_focus:
             return self.stdin.process_event(e)
 
-        if (e in ("<RIGHT>", '<Ctrl-f>') and
-                self.config.curtsies_right_arrow_completion and
-                self.cursor_offset == len(self.current_line)):
+        if (e in (key_dispatch[self.config.right_key] +
+                  key_dispatch[self.config.end_of_line_key] +
+                  ("<RIGHT>",))
+                and self.config.curtsies_right_arrow_completion
+                and self.cursor_offset == len(self.current_line)):
+
             self.current_line += self.current_suggestion
             self.cursor_offset = len(self.current_line)
-
         elif e in ("<UP>",) + key_dispatch[self.config.up_one_line_key]:
             self.up_one_line()
         elif e in ("<DOWN>",) + key_dispatch[self.config.down_one_line_key]:
