options: Enable &wildmenu, use "list:longest,full" for &wildmode by default #2677

runtime/doc/options.txt

@@ -7252,7 +7252,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 
 				*'wildmenu'* *'wmnu'* *'nowildmenu'* *'nowmnu'*
-'wildmenu' 'wmnu'	boolean	(default off)
+'wildmenu' 'wmnu'	boolean	(default on)
 			global
 			{not available if compiled without the |+wildmenu|
 			feature}
@@ -7292,7 +7292,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|hl-WildMenu|.
 
 						*'wildmode'* *'wim'*
-'wildmode' 'wim'	string	(Vim default: "full")
+'wildmode' 'wim'	string	(default: "list:longest,full")
 			global
 	Completion mode that is used for the character specified with
 	'wildchar'.  It is a comma separated list of up to four parts.  Each

runtime/doc/vim_diff.txt

@@ -32,6 +32,8 @@ these differences.
 - 'encoding' defaults to "utf-8"
 - 'nocompatible' is always set
 - 'ttyfast' is always set
+- 'wildmenu' is set by default
+- 'wildmode' defaults to "list:longest,full"
 
 ==============================================================================
 3. Changed features					 *nvim-features-changed*

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}

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
 :"

test/functional/ui/wildmode_spec.lua

@@ -17,7 +17,7 @@ describe("'wildmode'", function()
 
   describe("'wildmenu'", function()
     it(':sign <tab> shows wildmenu completions', function()
-      execute('set wildmode')
+      execute('set wildmode=full')
       execute('set wildmenu')
       feed(':sign <tab>')
       screen:expect([[