patch 9.1.0862: 'wildmenu' not enabled by default in nocp mode

Problem:  'wildmenu' not enabled by default in nocp mode
Solution: promote the default Vim value to true, it has been enabled
          in defaults.vim anyhow, so remove it there (Luca Saccarola)

closes: #16055

Signed-off-by: Luca Saccarola <github.e41mv@aleeas.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index 1dcc959c2615f0f590e34dddb94b3a942c24c065..953cec700cc62c2f86a5e81b4470fcb9fe221563 100644 (file)
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:  The Vim Project <https://github.com/vim/vim>
-" Last Change: 2024 Nov 09
+" Last Change: 2024 Nov 14
 " Former Maintainer:   Bram Moolenaar <Bram@vim.org>
 "
 " This is loaded if no vimrc file was found.
@@ -39,7 +39,6 @@ set backspace=indent,eol,start
 set history=200                " keep 200 lines of command line history
 set ruler              " show the cursor position all the time
 set showcmd            " display incomplete commands
-set wildmenu           " display completion matches in a status line
 
 set ttimeout           " time out for key codes
 set ttimeoutlen=100    " wait up to 100ms after Esc for special key

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f9189e59ad32b56f86e433bc34ba2d72512f44c9..73ff7cc600ac4fcd56d469540f000776472c427a 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*  For Vim version 9.1.  Last change: 2024 Nov 06
+*options.txt*  For Vim version 9.1.  Last change: 2024 Nov 14
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -9430,7 +9430,7 @@ A jump table for the options with a short description can be found at |Q_op|.
        happens when there are special characters.
 
                                *'wildmenu'* *'wmnu'* *'nowildmenu'* *'nowmnu'*
-'wildmenu' 'wmnu'      boolean (default off, set in |defaults.vim|)
+'wildmenu' 'wmnu'      boolean (default on)
                        global
        When 'wildmenu' is on, command-line completion operates in an enhanced
        mode.  On pressing 'wildchar' (usually <Tab>) to invoke completion,

diff --git a/src/optiondefs.h b/src/optiondefs.h
index 97fc4d4a6907124d7047715d1cd673d3ecdc650a..585604fb31c925b79775f7c5ce3608ab5c585cf0 100644 (file)
--- a/src/optiondefs.h
+++ b/src/optiondefs.h
@@ -2845,7 +2845,7 @@ static struct vimoption options[] =
                            {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
     {"wildmenu",    "wmnu", P_BOOL|P_VI_DEF,
                            (char_u *)&p_wmnu, PV_NONE, NULL, NULL,
-                           {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
+                           {(char_u *)TRUE, (char_u *)0L} SCTX_INIT},
     {"wildmode",    "wim",  P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_COLON,
                            (char_u *)&p_wim, PV_NONE, did_set_wildmode, expand_set_wildmode,
                            {(char_u *)"full", (char_u *)0L} SCTX_INIT},

diff --git a/src/version.c b/src/version.c
index f2e9473f7edecdb4fe70728d791b6c7b2c3c034f..69b5416094c6503c59ae23cab20734eac4456de9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    862,
 /**/
     861,
 /**/