diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-09-26 22:16:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 22:16:17 -0400 |
| commit | f610b807b48dbaf96fe05459927a8c926b67f8bb (patch) | |
| tree | 71429c5408ff4e26af9c66adf8cf8956622373cf /src/nvim/options.lua | |
| parent | 68bcb32ec43e2fab30dc05439fc77cf28793922c (diff) | |
| parent | 4ce24ff9da0f6551eeca2011dc9d05194bf02e12 (diff) | |
| download | rneovim-f610b807b48dbaf96fe05459927a8c926b67f8bb.tar.gz rneovim-f610b807b48dbaf96fe05459927a8c926b67f8bb.tar.bz2 rneovim-f610b807b48dbaf96fe05459927a8c926b67f8bb.zip | |
Merge pull request #5372 from jamessan/vim-7.4.1604
vim-patch:7.4.1604,7.4.1620,7.4.1629,7.4.1630,7.4.1642,7.4.1697
Closes #5149
Diffstat (limited to 'src/nvim/options.lua')
| -rw-r--r-- | src/nvim/options.lua | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 060ec8c1e1..583c63614a 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -644,6 +644,14 @@ return { defaults={if_true={vi=false}} }, { + full_name='emoji', abbreviation='emo', + type='bool', scope={'global'}, + vi_def=true, + redraw={'everything'}, + varname='p_emoji', + defaults={if_true={vi=true}} + }, + { full_name='encoding', abbreviation='enc', type='string', scope={'global'}, deny_in_modelines=true, |