clarify fish_vi_mode deprecation warning

Also, correct the Vi mode default escape timeout. I intended it to be 100 ms
in my previous change but it ended up 10 ms which is far too short. A 10 ms
delay will continue to cause problems for people running fish inside `screen`,
`tmux`, or over high latency connections.
This commit is contained in:
Kurtis Rader 2016-04-28 20:53:09 -07:00
parent ffad7b0b29
commit 3e24ae80b3
2 changed files with 6 additions and 7 deletions

View File

@ -5,12 +5,10 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
set fish_key_bindings fish_vi_key_bindings # This triggers the handler, which calls us again and ensures the user_key_bindings are executed set fish_key_bindings fish_vi_key_bindings # This triggers the handler, which calls us again and ensures the user_key_bindings are executed
return return
end end
# The default escape timeout is 300ms. But for users of Vi bindings that can # The default escape timeout is 300ms. But for users of Vi bindings that can be slightly
# be slightly annoying when trying to switch to Vi "normal" mode. Too, # annoying when trying to switch to Vi "normal" mode. So set a shorter timeout in this case
# vi-mode users are unlikely to use escape-as-meta. So set a much shorter # unless the user has explicitly set the delay.
# timeout in this case. set -q fish_escape_delay_ms; or set -g fish_escape_delay_ms 100
set -q fish_escape_delay_ms
or set -g fish_escape_delay_ms 10
set -l init_mode insert set -l init_mode insert
set -l eol_keys \$ g\$ \e\[F set -l eol_keys \$ g\$ \e\[F

View File

@ -1,5 +1,6 @@
function fish_vi_mode function fish_vi_mode
echo "This function is deprecated. Please call fish_vi_key_bindings directly" >&2 echo 'The `fish_vi_mode` function is deprecated.' >&2
echo 'Please switch to calling `fish_vi_key_bindings`.' >&2
# Turn on vi keybindings # Turn on vi keybindings
set -g fish_key_bindings fish_vi_key_bindings set -g fish_key_bindings fish_vi_key_bindings
end end