aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelipe Morales <hel.sheep@gmail.com>2015-05-16 15:09:40 -0300
committerJustin M. Keyes <justinkz@gmail.com>2015-05-17 15:24:31 -0400
commitb90378dfb01c5cca5ef8400acae6208476bc2647 (patch)
treea3db4befb13f861b2ed74a8dc2daa44f3f8e7850 /src
parentb1403e7d44819587cb4d622fb732c692bbdcca1c (diff)
downloadrneovim-b90378dfb01c5cca5ef8400acae6208476bc2647.tar.gz
rneovim-b90378dfb01c5cca5ef8400acae6208476bc2647.tar.bz2
rneovim-b90378dfb01c5cca5ef8400acae6208476bc2647.zip
options: Enable &wildmenu, use "list:longest,full" for &wildmode by default #2677
Diffstat (limited to 'src')
-rw-r--r--src/nvim/option.c8
-rw-r--r--src/nvim/testdir/test73.in1
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 9201f7b6c4..9357bb1947 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1622,12 +1622,12 @@ static vimoption_T
{"wildignorecase", "wic", P_BOOL|P_VI_DEF,
(char_u *)&p_wic, PV_NONE,
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
- {"wildmenu", "wmnu", P_BOOL|P_VI_DEF,
+ {"wildmenu", "wmnu", P_BOOL|P_VIM,
(char_u *)&p_wmnu, PV_NONE,
- {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
- {"wildmode", "wim", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+ {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
+ {"wildmode", "wim", P_STRING|P_VIM|P_COMMA|P_NODUP,
(char_u *)&p_wim, PV_NONE,
- {(char_u *)"full", (char_u *)0L} SCRIPTID_INIT},
+ {(char_u *)"", (char_u *)"list:longest,full"} SCRIPTID_INIT},
{"wildoptions", "wop", P_STRING|P_VI_DEF,
(char_u *)&p_wop, PV_NONE,
{(char_u *)"", (char_u *)0L}
diff --git a/src/nvim/testdir/test73.in b/src/nvim/testdir/test73.in
index 60cda2d970..c525e51d28 100644
--- a/src/nvim/testdir/test73.in
+++ b/src/nvim/testdir/test73.in
@@ -2,6 +2,7 @@ Tests for find completion.
STARTTEST
:so small.vim
+:set wildmode=full
:" Do all test in a separate window to avoid E211 when we recursively
:" delete the Xfind directory during cleanup
:"