From 437bc13ea101835511bf4b5029c84482c1e30e62 Mon Sep 17 00:00:00 2001 From: Luca Saccarola Date: Thu, 14 Nov 2024 21:21:17 +0100 Subject: [PATCH] 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 Signed-off-by: Christian Brabandt --- runtime/defaults.vim | 3 +-- runtime/doc/options.txt | 4 ++-- src/optiondefs.h | 2 +- src/version.c | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/runtime/defaults.vim b/runtime/defaults.vim index 1dcc959c26..953cec700c 100644 --- a/runtime/defaults.vim +++ b/runtime/defaults.vim @@ -1,7 +1,7 @@ " The default vimrc file. " " Maintainer: The Vim Project -" Last Change: 2024 Nov 09 +" Last Change: 2024 Nov 14 " Former Maintainer: Bram Moolenaar " " 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 f9189e59ad..73ff7cc600 100644 --- 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 ) to invoke completion, diff --git a/src/optiondefs.h b/src/optiondefs.h index 97fc4d4a69..585604fb31 100644 --- 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 f2e9473f7e..69b5416094 100644 --- 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, /**/