aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/option.c
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2014-07-17 12:06:31 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2014-07-17 12:06:31 -0300
commit953d61cbf82d5f1acd68bd1ae2101d92f5ec5492 (patch)
treed4aa1fe08ad3f0a7e27b6628aad4925cd1fbfb2a /src/nvim/option.c
parentb92630c2fff7950141630f0d62b11404d0589ece (diff)
parent4dc642aa622cfac09f2f4752907137d68d8508fe (diff)
downloadrneovim-953d61cbf82d5f1acd68bd1ae2101d92f5ec5492.tar.gz
rneovim-953d61cbf82d5f1acd68bd1ae2101d92f5ec5492.tar.bz2
rneovim-953d61cbf82d5f1acd68bd1ae2101d92f5ec5492.zip
Merge PR #895 'Core service providers...'
Diffstat (limited to 'src/nvim/option.c')
-rw-r--r--src/nvim/option.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index b80f014441..28bbfb41e7 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -963,6 +963,12 @@ static struct vimoption
{"infercase", "inf", P_BOOL|P_VI_DEF,
(char_u *)&p_inf, PV_INF,
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+ {"initclipboard","icpb",P_STRING|P_VI_DEF|P_SECURE,
+ (char_u *)&p_icpb, PV_NONE,
+ {(char_u *)NULL, (char_u *)0L} SCRIPTID_INIT},
+ {"initpython","ipy",P_STRING|P_VI_DEF|P_SECURE,
+ (char_u *)&p_ipy, PV_NONE,
+ {(char_u *)NULL, (char_u *)0L} SCRIPTID_INIT},
{"insertmode", "im", P_BOOL|P_VI_DEF|P_VIM,
(char_u *)&p_im, PV_NONE,
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
@@ -1625,6 +1631,9 @@ static struct vimoption
{"undoreload", "ur", P_NUM|P_VI_DEF,
(char_u *)&p_ur, PV_NONE,
{ (char_u *)10000L, (char_u *)0L} SCRIPTID_INIT},
+ {"unnamedclip", "ucp", P_BOOL|P_VI_DEF|P_VIM,
+ (char_u *)&p_unc, PV_NONE,
+ {(char_u *)FALSE, (char_u *)FALSE} SCRIPTID_INIT},
{"updatecount", "uc", P_NUM|P_VI_DEF,
(char_u *)&p_uc, PV_NONE,
{(char_u *)200L, (char_u *)0L} SCRIPTID_INIT},