aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2014-08-06 13:20:27 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2014-08-06 13:20:27 -0300
commit8fa4abf15a9898ee185b71b9a9a746c82b50a1b0 (patch)
tree8ff04ec7362cdd7a678bfba980ac3633a4c67cb8 /src
parentacd0824a320417a1ad928171e5c7b8df1127eb9f (diff)
parented71401b244450a8a9c5e2b03ef784a337a7c471 (diff)
downloadrneovim-8fa4abf15a9898ee185b71b9a9a746c82b50a1b0.tar.gz
rneovim-8fa4abf15a9898ee185b71b9a9a746c82b50a1b0.tar.bz2
rneovim-8fa4abf15a9898ee185b71b9a9a746c82b50a1b0.zip
Merge PR #1040 'Fix segfault caused by default value of ipy/icpb options'
Diffstat (limited to 'src')
-rw-r--r--src/nvim/option.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 28bbfb41e7..1e623041e7 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -965,10 +965,10 @@ static struct vimoption
{(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},
+ {(char_u *)"", (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},
+ {(char_u *)"", (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},