Skip to content

Commit 1e287d1

Browse files
committed
Terminfo.tigetstr and tiparm should return String object
1 parent 74a7ffa commit 1e287d1

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

lib/reline/ansi.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,18 @@ def self.set_default_key_bindings(config)
4141

4242
def self.set_default_key_bindings_terminfo(config)
4343
{
44-
Reline::Terminfo.tigetstr('khome').to_s.bytes => :ed_move_to_beg,
45-
Reline::Terminfo.tigetstr('kend').to_s.bytes => :ed_move_to_end,
46-
Reline::Terminfo.tigetstr('kcuu1').to_s.bytes => :ed_prev_history,
47-
Reline::Terminfo.tigetstr('kcud1').to_s.bytes => :ed_next_history,
48-
Reline::Terminfo.tigetstr('kcuf1').to_s.bytes => :ed_next_char,
49-
Reline::Terminfo.tigetstr('kcub1').to_s.bytes => :ed_prev_char,
44+
Reline::Terminfo.tigetstr('khome').bytes => :ed_move_to_beg,
45+
Reline::Terminfo.tigetstr('kend').bytes => :ed_move_to_end,
46+
Reline::Terminfo.tigetstr('kcuu1').bytes => :ed_prev_history,
47+
Reline::Terminfo.tigetstr('kcud1').bytes => :ed_next_history,
48+
Reline::Terminfo.tigetstr('kcuf1').bytes => :ed_next_char,
49+
Reline::Terminfo.tigetstr('kcub1').bytes => :ed_prev_char,
5050
# Escape sequences that omit the move distance and are set to defaults
5151
# value 1 may be sometimes sent by pressing the arrow-key.
52-
Reline::Terminfo.tigetstr('cuu').to_s.sub(/%p1%d/, '').bytes => :ed_prev_history,
53-
Reline::Terminfo.tigetstr('cud').to_s.sub(/%p1%d/, '').bytes => :ed_next_history,
54-
Reline::Terminfo.tigetstr('cuf').to_s.sub(/%p1%d/, '').bytes => :ed_next_char,
55-
Reline::Terminfo.tigetstr('cub').to_s.sub(/%p1%d/, '').bytes => :ed_prev_char,
52+
Reline::Terminfo.tigetstr('cuu').sub(/%p1%d/, '').bytes => :ed_prev_history,
53+
Reline::Terminfo.tigetstr('cud').sub(/%p1%d/, '').bytes => :ed_next_history,
54+
Reline::Terminfo.tigetstr('cuf').sub(/%p1%d/, '').bytes => :ed_next_char,
55+
Reline::Terminfo.tigetstr('cub').sub(/%p1%d/, '').bytes => :ed_prev_char,
5656
}.each_pair do |key, func|
5757
config.add_default_key_binding_by_keymap(:emacs, key, func)
5858
config.add_default_key_binding_by_keymap(:vi_insert, key, func)

lib/reline/terminfo.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ def self.setupterm(term, fildes)
5757
end
5858

5959
def self.tigetstr(capname)
60-
@tigetstr.(capname)
60+
@tigetstr.(capname).to_s
6161
end
6262

6363
def self.tiparm(str, *args)
6464
new_args = []
6565
args.each do |a|
6666
new_args << Fiddle::TYPE_INT << a
6767
end
68-
@tiparm.(str, *new_args)
68+
@tiparm.(str, *new_args).to_s
6969
end
7070

7171
def self.enabled?

0 commit comments

Comments
 (0)