diff options
| author | Jonathan Slenders <jonathan@slenders.be> | 2016-12-17 15:32:51 +0100 |
|---|---|---|
| committer | Jonathan Slenders <jonathan@slenders.be> | 2016-12-17 15:32:51 +0100 |
| commit | 5b372e082896df2edfcc6048e91d8769b89d445f (patch) | |
| tree | bfe763e7ac9be3d73bda0cfeed4a8cf5768805f4 | |
| parent | 17047496500480fc2c7653e701da0fdd5e08bfd4 (diff) | |
Removed the 'enable_visual_key' filter from load_vi_bindings. This was not used.
| -rw-r--r-- | prompt_toolkit/key_binding/bindings/vi.py | 9 | ||||
| -rw-r--r-- | prompt_toolkit/key_binding/defaults.py | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/prompt_toolkit/key_binding/bindings/vi.py b/prompt_toolkit/key_binding/bindings/vi.py index 2a3e1b69..da97996b 100644 --- a/prompt_toolkit/key_binding/bindings/vi.py +++ b/prompt_toolkit/key_binding/bindings/vi.py @@ -137,16 +137,13 @@ class TextObject(object): return new_document, clipboard_data -def load_vi_bindings(enable_visual_key=Always(), get_search_state=None): +def load_vi_bindings(get_search_state=None): """ Vi extensions. # Overview of Readline Vi commands: # http://www.catonmat.net/download/bash-vi-editing-mode-cheat-sheet.pdf - :param enable_visual_key: Filter to enable lowercase 'v' bindings. A reason - to disable these are to support open-in-editor functionality. These key - bindings conflict. :param get_search_state: None or a callable that takes a CommandLineInterface and returns a SearchState. """ @@ -162,8 +159,6 @@ def load_vi_bindings(enable_visual_key=Always(), get_search_state=None): registry = ConditionalRegistry(Registry(), ViMode()) handle = registry.add_binding - enable_visual_key = to_cli_filter(enable_visual_key) - # Default get_search_state. if get_search_state is None: def get_search_state(cli): return cli.search_state @@ -572,7 +567,7 @@ def load_vi_bindings(enable_visual_key=Always(), get_search_state=None): else: event.current_buffer.exit_selection() - @handle('v', filter=navigation_mode & enable_visual_key) + @handle('v', filter=navigation_mode) def _(event): " Enter character selection mode. " event.current_buffer.start_selection(selection_type=SelectionType.CHARACTERS) diff --git a/prompt_toolkit/key_binding/defaults.py b/prompt_toolkit/key_binding/defaults.py index cd770df6..7f32f3d5 100644 --- a/prompt_toolkit/key_binding/defaults.py +++ b/prompt_toolkit/key_binding/defaults.py @@ -77,8 +77,7 @@ def load_default_key_bindings( enable_extra_page_navigation), # Load Vi bindings. - load_vi_bindings(enable_visual_key=~enable_open_in_editor, - get_search_state=get_search_state), + load_vi_bindings(get_search_state=get_search_state), ConditionalRegistry(load_vi_open_in_editor_bindings(), enable_open_in_editor), |