aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/options.lua
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-01-02 18:05:52 -0500
committerJustin M. Keyes <justinkz@gmail.com>2016-01-02 18:05:52 -0500
commit59eaba28948137acbd89f31dce1558d97228b9cd (patch)
tree0240a406e072ed50276d6f167ca6659103f20a22 /src/nvim/options.lua
parentcb625940422ddfb25fdb9a6dc6c6a26a56a228e8 (diff)
parent70f6e2ce52b966866f57ee5a1753ba420b1bd1a4 (diff)
downloadrneovim-59eaba28948137acbd89f31dce1558d97228b9cd.tar.gz
rneovim-59eaba28948137acbd89f31dce1558d97228b9cd.tar.bz2
rneovim-59eaba28948137acbd89f31dce1558d97228b9cd.zip
Merge pull request #3655 from bfredl/enc_default
Default to encoding=utf-8
Diffstat (limited to 'src/nvim/options.lua')
-rw-r--r--src/nvim/options.lua9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index e485b90394..945626ff79 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -748,7 +748,7 @@ return {
type='string', list='comma', scope={'global'},
vi_def=true,
varname='p_fencs',
- defaults={if_true={vi="ucs-bom"}}
+ defaults={if_true={vi="ucs-bom,utf-8,default,latin1"}}
},
{
full_name='fileformat', abbreviation='ff',
@@ -1285,7 +1285,7 @@ return {
vim=true,
alloced=true,
varname='p_isk',
- defaults={if_true={vi="@,48-57,_", vim=macros('ISK_LATIN1')}}
+ defaults={if_true={vi="@,48-57,_", vim="@,48-57,_,192-255"}}
},
{
full_name='isprint', abbreviation='isp',
@@ -1294,10 +1294,7 @@ return {
vi_def=true,
redraw={'all_windows'},
varname='p_isp',
- defaults={
- condition='MSWIN',
- if_true={vi="@,~-255"},
- if_false={vi=macros("ISP_LATIN1")}
+ defaults={if_true={vi="@,161-255"}
}
},
{