diff options
| author | aycabta <aycabta@gmail.com> | 2020-12-22 04:38:01 +0900 |
|---|---|---|
| committer | aycabta <aycabta@gmail.com> | 2020-12-22 23:45:43 +0900 |
| commit | b52bc4a9c29e80e10b7e64dbebd97117916d3982 (patch) | |
| tree | cbad7f2d553df7529406be8f138a6c0537473cef /lib | |
| parent | 294552ca6c38b90a2be257727ce5df69b93a4de7 (diff) | |
[ruby/reline] Support isearch-terminators
https://github.com/ruby/reline/commit/a7922da16b
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/reline/config.rb | 3 | ||||
| -rw-r--r-- | lib/reline/line_editor.rb | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/reline/config.rb b/lib/reline/config.rb index c66810d30e..4141031912 100644 --- a/lib/reline/config.rb +++ b/lib/reline/config.rb @@ -38,6 +38,7 @@ class Reline::Config vi-ins-mode-icon emacs-mode-string enable-bracketed-paste + isearch-terminators } VARIABLE_NAME_SYMBOLS = VARIABLE_NAMES.map { |v| :"#{v.tr(?-, ?_)}" } VARIABLE_NAME_SYMBOLS.each do |v| @@ -238,7 +239,7 @@ class Reline::Config when 'completion-query-items' @completion_query_items = value.to_i when 'isearch-terminators' - @isearch_terminators = instance_eval(value) + @isearch_terminators = retrieve_string(value) when 'editing-mode' case value when 'emacs' diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 0584df341c..db5cb3d7ed 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -1593,9 +1593,11 @@ class Reline::LineEditor searcher = generate_searcher searcher.resume(key) @searching_prompt = "(reverse-i-search)`': " + termination_keys = ["\C-j".ord] + termination_keys.concat(@config.isearch_terminators&.chars&.map(&:ord)) if @config.isearch_terminators @waiting_proc = ->(k) { case k - when "\C-j".ord + when *termination_keys if @history_pointer buffer = Reline::HISTORY[@history_pointer] else |