aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/options.lua
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-12-23 15:27:42 +0300
committerZyX <kp-pav@yandex.ru>2017-12-23 15:27:42 +0300
commitc9ab209f9e70b2ebd91ef4cf3857c30822a6af57 (patch)
treeeb39e7370cf72c89b589cac204194ad68b9dfc15 /src/nvim/options.lua
parentedccf18df56d982dea350770ea42ffa25759b43f (diff)
parentaa951b14893d8a30ec3bad6fb4b7064ccda16d5c (diff)
downloadrneovim-c9ab209f9e70b2ebd91ef4cf3857c30822a6af57.tar.gz
rneovim-c9ab209f9e70b2ebd91ef4cf3857c30822a6af57.tar.bz2
rneovim-c9ab209f9e70b2ebd91ef4cf3857c30822a6af57.zip
Merge branch 'master' into hide-container-impl
Diffstat (limited to 'src/nvim/options.lua')
-rw-r--r--src/nvim/options.lua7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 45efd49391..35baaf948f 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -1457,6 +1457,13 @@ return {
defaults={if_true={vi=""}}
},
{
+ full_name='makeencoding', abbreviation='menc',
+ type='string', scope={'global', 'buffer'},
+ vi_def=true,
+ varname='p_menc',
+ defaults={if_true={vi=""}}
+ },
+ {
full_name='makeprg', abbreviation='mp',
type='string', scope={'global', 'buffer'},
secure=true,