aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/options.lua
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-07-10 08:10:15 +0800
committerckelsel <ckelsel@hotmail.com>2017-07-10 08:10:15 +0800
commit465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77 (patch)
treeedae38568202ba41dee4a49f78884da313fd114b /src/nvim/options.lua
parent1514cdc7d8863eeee6b04883b1c50aac40048b49 (diff)
parent6725667d31591e8025589c4c1df34469f3bfdb52 (diff)
downloadrneovim-465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77.tar.gz
rneovim-465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77.tar.bz2
rneovim-465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/options.lua')
-rw-r--r--src/nvim/options.lua4
1 files changed, 2 insertions, 2 deletions
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',