diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-07-06 04:02:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 04:02:37 +0000 |
| commit | c07e144c821abe2bcb7824c1c683ebf674d69754 (patch) | |
| tree | 2f4c685fced76a46f86602fb1c2ad3b5f29e18de | |
| parent | 69f0847ccc79acabb1cad5b1b54c906973946d81 (diff) | |
| parent | e4dc878f8930e4c41f1ef4fc59fea567d98b76b1 (diff) | |
| download | rneovim-c07e144c821abe2bcb7824c1c683ebf674d69754.tar.gz rneovim-c07e144c821abe2bcb7824c1c683ebf674d69754.tar.bz2 rneovim-c07e144c821abe2bcb7824c1c683ebf674d69754.zip | |
Merge pull request #6969 from jamessan/ttimeoutlen
options: Default to 'ttimeout' and 'ttimeoutlen=50'
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rw-r--r-- | src/nvim/options.lua | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index bb5cfb4a80..8506418c6c 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -6272,7 +6272,7 @@ A jump table for the options with a short description can be found at |Q_op|. for any key that can follow <c-f> in a mapping. *'ttimeout'* *'nottimeout'* -'ttimeout' boolean (default off) +'ttimeout' boolean (default on) global This option and 'ttimeoutlen' determine the behavior when part of a key code sequence has been received by the terminal UI. For example, @@ -6287,7 +6287,7 @@ A jump table for the options with a short description can be found at |Q_op|. complete. *'ttimeoutlen'* *'ttm'* -'ttimeoutlen' 'ttm' number (default -1) +'ttimeoutlen' 'ttm' number (default 50) global The time in milliseconds that is waited for a key code sequence to complete. Also used for CTRL-\ CTRL-N and CTRL-\ CTRL-G diff --git a/src/nvim/options.lua b/src/nvim/options.lua index c2778a6329..103227f6b5 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -2513,14 +2513,14 @@ return { vi_def=true, vim=true, varname='p_ttimeout', - defaults={if_true={vi=false}} + defaults={if_true={vi=true}} }, { full_name='ttimeoutlen', abbreviation='ttm', type='number', scope={'global'}, vi_def=true, varname='p_ttm', - defaults={if_true={vi=-1}} + defaults={if_true={vi=50}} }, { full_name='ttyfast', abbreviation='tf', |