h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-06 00:41:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Reduce default escape delay

Browse Source 
300ms was waaay too long, and even 100ms wasn't necessary.

Emacs' evil mode uses 10ms (0.01s), so let's stay a tad higher in case
some terminals are slow.

If anyone really wants to be able to type alt+h with escape, let them
raise the timeout.

Fixes #3904.
This commit is contained in:
Fabian Homborg
2019-02-07 12:08:24 +01:00
parent 1a3471fa7d
commit 7c8b444927
6 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/bind.expect
View File

@@ -3,7 +3,7 @@ spawn $fish
expect_prompt
# Fish should start in default-mode (i.e., emacs) bindings. The default escape
# timeout is 300ms.
# timeout is 30ms.
# Verify the emacs transpose word (\et) behavior using various delays,
# including none, after the escape character.
@@ -21,7 +21,7 @@ expect_prompt -re {\r\ndef abc\r\n} {
# the words.
send "echo ghi jkl"
send "\033"
sleep 0.050
sleep 0.010
send "t\r"
expect_prompt -re {\r\njkl ghi\r\n} {
puts "emacs transpose words, default timeout: short delay"
@@ -33,7 +33,7 @@ expect_prompt -re {\r\njkl ghi\r\n} {
# occur and the "t" should become part of the text that is echoed.
send "echo mno pqr"
send "\033"
sleep 0.400
sleep 0.200
send "t\r"
expect_prompt -re {\r\nmno pqrt\r\n} {
puts "emacs transpose words, default timeout: long delay"
@@ -54,10 +54,6 @@ expect_prompt -re {\r\ndefault\r\npaste} {
send "set -g fish_key_bindings fish_vi_key_bindings\r"
expect_prompt
# These vi tests assume the fish_vi_key_bindings default escape timeout of
# 10ms is in effect; not the 300ms timeout for the default-mode.
#
# Go through a prompt cycle to let fish catch up, it may be slow due to ASAN
send "echo success: default escape timeout\r"
expect_prompt -re {\r\nsuccess: default escape timeout\r\n} {
@@ -66,14 +62,6 @@ expect_prompt -re {\r\nsuccess: default escape timeout\r\n} {
puts stderr "prime vi mode, default timeout"
}
# Verify the default timeout has been set to the expected value.
send "echo fish_escape_delay_ms=\$fish_escape_delay_ms\r"
expect_prompt -re {\r\nfish_escape_delay_ms=100\r\n} {
puts "vi-mode default timeout set correctly"
} unmatched {
puts stderr "vi-mode default timeout not set correctly"
}
send "echo fail: default escape timeout"
send "\033"
# Delay needed to allow fish to transition to vi "normal" mode. The delay is
@@ -170,9 +158,9 @@ sleep 0.350
send "ddi"
send "echo success: lengthened escape timeout\r"
expect_prompt -re {\r\nsuccess: lengthened escape timeout\r\n} {
puts "vi replace line, 100ms timeout: long delay"
puts "vi replace line, 200ms timeout: long delay"
} unmatched {
puts stderr "vi replace line, 100ms timeout: long delay"
puts stderr "vi replace line, 200ms timeout: long delay"
}
# Verify that we don't switch to vi normal mode if we don't wait long enough
@@ -183,9 +171,9 @@ sleep 0.050
send "ddi"
send "inserted\r"
expect_prompt -re {\r\nfail: no normal modediinserted\r\n} {
puts "vi replace line, 100ms timeout: short delay"
puts "vi replace line, 200ms timeout: short delay"
} unmatched {
puts stderr "vi replace line, 100ms timeout: short delay"
puts stderr "vi replace line, 200ms timeout: short delay"
}
# Test 't' binding that contains non-zero arity function (forward-jump) followed
@@ -223,7 +211,7 @@ expect_prompt -re {\r\nfish_escape_delay_ms=200\r\n} {
puts stderr "default-mode custom timeout not set correctly"
}
# Reset it to 100ms.
# Set it to 100ms.
send "set -g fish_escape_delay_ms 100\r"
expect_prompt