Merge branch 'fix-just-499'

thomasballinger · thomasballinger · commit e45c56ca4cbb · 2015-03-07T09:04:46.000-05:00
fixes #499
diff --git a/bpython/config.py b/bpython/config.py
@@ -107,10 +107,12 @@ def loadini(struct, configfile):
             'exit': '',
             'external_editor': 'F7',
             'help': 'F1',
+            'incremental_search': 'M-s',
             'last_output': 'F9',
             'left': 'C-b',
             'pastebin': 'F8',
             'reimport': 'F6',
+            'reverse_incremental_search': 'M-r',
             'right': 'C-f',
             'save': 'C-s',
             'search': 'C-o',
@@ -185,6 +187,9 @@ def get_key_no_doublebind(command):
     struct.toggle_file_watch_key = get_key_no_doublebind('toggle_file_watch')
     struct.undo_key = get_key_no_doublebind('undo')
     struct.reimport_key = get_key_no_doublebind('reimport')
+    struct.reverse_incremental_search_key = get_key_no_doublebind(
+        'reverse_incremental_search')
+    struct.incremental_search_key = get_key_no_doublebind('incremental_search')
     struct.up_one_line_key = get_key_no_doublebind('up_one_line')
     struct.down_one_line_key = get_key_no_doublebind('down_one_line')
     struct.cut_to_buffer_key = get_key_no_doublebind('cut_to_buffer')
@@ -200,8 +205,6 @@ def get_key_no_doublebind(command):
     struct.end_of_line_key = get_key_no_doublebind('end_of_line')
     struct.beginning_of_line_key = get_key_no_doublebind('beginning_of_line')
     struct.transpose_chars_key = get_key_no_doublebind('transpose_chars')
-    struct.clear_line_key = get_key_no_doublebind('clear_line')
-    struct.clear_screen_key = get_key_no_doublebind('clear_screen')
     struct.exit_key = get_key_no_doublebind('exit')
     struct.last_output_key = get_key_no_doublebind('last_output')
     struct.edit_config_key = get_key_no_doublebind('edit_config')
@@ -266,10 +269,6 @@ def get_key_no_doublebind(command):
                              (color_scheme_name, ))
             sys.exit(1)
 
-    # checks for valid key configuration this part still sucks
-    for key in (struct.pastebin_key, struct.save_key):
-        key_dispatch[key]
-
     # expand path of history file
     struct.hist_file = os.path.expanduser(struct.hist_file)
 
diff --git a/bpython/curtsiesfrontend/manual_readline.py b/bpython/curtsiesfrontend/manual_readline.py
@@ -291,13 +291,9 @@ def transpose_character_before_cursor(cursor_offset, line):
 def transpose_word_before_cursor(cursor_offset, line):
     return cursor_offset, line  # TODO Not implemented
 
-# bonus functions (not part of readline)
-
-
-@edit_keys.on('<Esc+r>')
-def delete_line(cursor_offset, line):
-    return 0, ""
+# TODO undo all changes to line: meta-r
 
+# bonus functions (not part of readline)
 
 @edit_keys.on('<Esc+u>')
 def uppercase_next_word(cursor_offset, line):
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -245,6 +245,9 @@ def load_module(self, name):
                 self.watcher.track_module(module.__file__)
             return module
 
+        def get_data(self, pathname):
+            return open(pathname, "rb").read()
+
 
 class ImportFinder(object):
 
@@ -608,9 +611,9 @@ def process_key_event(self, e):
             self.on_control_d()
         elif e in ("<Esc+.>",):
             self.get_last_word()
-        elif e in ("<Esc+r>",):
+        elif e in key_dispatch[self.config.reverse_incremental_search_key]:
             self.incremental_search(reverse=True)
-        elif e in ("<Esc+s>",):
+        elif e in key_dispatch[self.config.incremental_search_key]:
             self.incremental_search()
         elif (e in ("<BACKSPACE>",) + key_dispatch[self.config.backspace_key]
               and self.incremental_search_mode):
diff --git a/bpython/sample-config b/bpython/sample-config
@@ -77,6 +77,8 @@
 # exit = C-d
 # external_editor = F7
 # edit_config = F3
+# reverse_incremental_search = M-r
+# incremental_search = M-s
 
 [curtsies]
 
