diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2025-03-02 06:40:52 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2025-03-02 07:02:10 +0800 |
| commit | 13513835798c732554de277229d4c6744df11502 (patch) | |
| tree | d3e6bc7de1f3f81d0a70b40c4665002a9a46824c /src | |
| parent | 26775183ff67968cef06d42666f451c0d1e5c4dc (diff) | |
| download | rneovim-13513835798c732554de277229d4c6744df11502.tar.gz rneovim-13513835798c732554de277229d4c6744df11502.tar.bz2 rneovim-13513835798c732554de277229d4c6744df11502.zip | |
vim-patch:9.1.1161: preinsert requires bot "menu" and "menuone" to be set
Problem: preinsert requires bot "menu" and "menuone" to be set,
but "menu" is redundant (after v9.1.1160)
Solution: preinsert only requires menuone (glepnir)
closes: vim/vim#16763
https://github.com/vim/vim/commit/94a045ed56d7616c0cd0080d3f308d6cf9fbe64c
Co-authored-by: glepnir <glephunter@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/insexpand.c | 9 | ||||
| -rw-r--r-- | src/nvim/options.lua | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index 2664fc8045..d02a698f08 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -1808,13 +1808,12 @@ int ins_compl_len(void) return compl_length; } -/// Return TRUE when preinsert is set AND both 'menu' and 'menuone' flags -/// are also set, otherwise return FALSE. +/// Return true when the 'completeopt' "preinsert" flag is in effect, +/// otherwise return false. static bool ins_compl_has_preinsert(void) { - return (get_cot_flags() - & (kOptCotFlagFuzzy|kOptCotFlagPreinsert|kOptCotFlagMenu|kOptCotFlagMenuone)) - == (kOptCotFlagPreinsert|kOptCotFlagMenu|kOptCotFlagMenuone); + return (get_cot_flags() & (kOptCotFlagFuzzy|kOptCotFlagPreinsert|kOptCotFlagMenuone)) + == (kOptCotFlagPreinsert|kOptCotFlagMenuone); } /// Returns true if the pre-insert effect is valid and the cursor is within diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 73605024db..ff919bb522 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -1543,9 +1543,8 @@ local options = { preinsert Preinsert the portion of the first candidate word that is not part of the current completion leader and using the - |hl-ComplMatchIns| highlight group. Does not work when - "fuzzy" is set. Requires both "menu" and "menuone" to be - set. + |hl-ComplMatchIns| highlight group. In order for it to + work, "fuzzy" must not bet set and "menuone" must be set. preview Show extra information about the currently selected completion in the preview window. Only works in |