diff options
| author | tomoya ishida <tomoyapenguin@gmail.com> | 2024-05-02 23:41:04 +0900 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2024-05-02 14:41:07 +0000 |
| commit | c78cebb469fe56b45ee5daad16ae976b7760497c (patch) | |
| tree | 92fab41d84eb1fb9b387b14ab12bd198d94f3d21 /lib | |
| parent | 2eefbef2eeeed8690daff5f111a36f72711a474c (diff) | |
[ruby/reline] Fix default and additional key bindings vanish bug
(https://github.com/ruby/reline/pull/697)
https://github.com/ruby/reline/commit/fc9b4d2274
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/reline.rb | 1 | ||||
| -rw-r--r-- | lib/reline/config.rb | 12 | ||||
| -rw-r--r-- | lib/reline/key_actor/base.rb | 4 |
3 files changed, 1 insertions, 16 deletions
diff --git a/lib/reline.rb b/lib/reline.rb index 7774572f92..d5bf2e363b 100644 --- a/lib/reline.rb +++ b/lib/reline.rb @@ -340,7 +340,6 @@ module Reline unless config.test_mode or config.loaded? config.read - config.reset_default_key_bindings io_gate.set_default_key_bindings(config) end diff --git a/lib/reline/config.rb b/lib/reline/config.rb index 58bf09ac02..234758963f 100644 --- a/lib/reline/config.rb +++ b/lib/reline/config.rb @@ -76,11 +76,7 @@ class Reline::Config if editing_mode_is?(:vi_command) @editing_mode_label = :vi_insert end - @additional_key_bindings.keys.each do |key| - @additional_key_bindings[key].clear - end @oneshot_key_bindings.clear - reset_default_key_bindings end def editing_mode @@ -134,6 +130,7 @@ class Reline::Config end def read(file = nil) + @loaded = true file ||= default_inputrc_path begin if file.respond_to?(:readlines) @@ -146,7 +143,6 @@ class Reline::Config end read_lines(lines, file) - @loaded = true self rescue InvalidInputrc => e warn e.message @@ -177,12 +173,6 @@ class Reline::Config @key_actors[@keymap_label].default_key_bindings[keystroke] = target end - def reset_default_key_bindings - @key_actors.values.each do |ka| - ka.reset_default_key_bindings - end - end - def read_lines(lines, file = nil) if not lines.empty? and lines.first.encoding != Reline.encoding_system_needs begin diff --git a/lib/reline/key_actor/base.rb b/lib/reline/key_actor/base.rb index a1cd7fb2a1..194e98938c 100644 --- a/lib/reline/key_actor/base.rb +++ b/lib/reline/key_actor/base.rb @@ -12,8 +12,4 @@ class Reline::KeyActor::Base def default_key_bindings @default_key_bindings end - - def reset_default_key_bindings - @default_key_bindings.clear - end end |