diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-12-30 08:27:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-30 08:27:56 +0100 |
commit | 00af06b3728e16155e08833e7e7708c495f500de (patch) | |
tree | 2d90915886e5643d72d1733733fc02533f50c920 /src/nvim/options.lua | |
parent | 34a59242a0d42687a49119cca590e7b4203496ef (diff) | |
parent | 5e1cad6d3378398c059e1a7144e1310b7bcb2398 (diff) | |
download | rneovim-00af06b3728e16155e08833e7e7708c495f500de.tar.gz rneovim-00af06b3728e16155e08833e7e7708c495f500de.tar.bz2 rneovim-00af06b3728e16155e08833e7e7708c495f500de.zip |
Merge #11616 from janlazo/vim-8.0.1491
vim-patch:8.0.{1356,1491,1495,1522,1538,1540},8.1.{554,670,1300,1303,1875,2377}
Diffstat (limited to 'src/nvim/options.lua')
-rw-r--r-- | src/nvim/options.lua | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 93bfc1c0b1..7d080b8d56 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -1816,6 +1816,14 @@ return { defaults={if_true={vi=true}} }, { + full_name='pumblend', abbreviation='pb', + type='number', scope={'global'}, + vi_def=true, + redraw={'ui_option'}, + varname='p_pb', + defaults={if_true={vi=0}} + }, + { full_name='pumheight', abbreviation='ph', type='number', scope={'global'}, vi_def=true, @@ -1823,12 +1831,11 @@ return { defaults={if_true={vi=0}} }, { - full_name='pumblend', abbreviation='pb', + full_name='pumwidth', abbreviation='pw', type='number', scope={'global'}, vi_def=true, - redraw={'ui_option'}, - varname='p_pb', - defaults={if_true={vi=0}} + varname='p_pw', + defaults={if_true={vi=15}} }, { full_name='pyxversion', abbreviation='pyx', |