Mercurial > vim
changeset 36223:f6ea99828a45 v9.1.0752
patch 9.1.0752: can set 'cedit' to an invalid value
Commit: https://github.com/vim/vim/commit/25732435c56d762abb260499680939bd8882c708
Author: Milly <milly.ca@gmail.com>
Date: Tue Oct 1 19:30:20 2024 +0200
patch 9.1.0752: can set 'cedit' to an invalid value
Problem: can set cedit to an invalid value
Solution: Check that the value is a valid key name
(Milly)
closes: #15778
Signed-off-by: Milly <milly.ca@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 01 Oct 2024 19:45:05 +0200 |
| parents | fa8352a68a17 |
| children | d173ee91556b |
| files | runtime/doc/options.txt src/ex_getln.c src/testdir/gen_opt_test.vim src/version.c |
| diffstat | 4 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 9.1. Last change: 2024 Sep 26 +*options.txt* For Vim version 9.1. Last change: 2024 Oct 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1651,9 +1651,10 @@ A jump table for the options with a shor The default is CTRL-F when 'compatible' is off. Only non-printable keys are allowed. The key can be specified as a single character, but it is difficult to - type. The preferred way is to use the <> notation. Examples: > - :exe "set cedit=\<C-Y>" - :exe "set cedit=\<Esc>" + type. The preferred way is to use |key-notation| (e.g. <Up>, <C-F>) or + a letter preceded with a caret (e.g. `^F` is CTRL-F). Examples: > + :set cedit=^Y + :set cedit=<Esc> < |Nvi| also has this option, but it only uses the first character. See |cmdwin|. NOTE: This option is set to the Vim default value when 'compatible'
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4445,7 +4445,7 @@ did_set_cedit(optset_T *args UNUSED) else { n = string_to_key(p_cedit, FALSE); - if (vim_isprintc(n)) + if (n == 0 || vim_isprintc(n)) return e_invalid_argument; cedit_key = n; }
--- a/src/testdir/gen_opt_test.vim +++ b/src/testdir/gen_opt_test.vim @@ -72,7 +72,7 @@ let test_values = { \ 'bufhidden': [['', 'hide', 'wipe'], ['xxx', 'hide,wipe']], \ 'buftype': [['', 'help', 'nofile'], ['xxx', 'help,nofile']], \ 'casemap': [['', 'internal'], ['xxx']], - \ 'cedit': [['', '\<Esc>'], ['xxx', 'f']], + \ 'cedit': [['', '^Y', '<Esc>'], ['xxx', 'f', '<xxx>']], \ 'clipboard': [['', 'unnamed', 'autoselect,unnamed', 'html', 'exclude:vimdisplay'], ['xxx', '\ze*', 'exclude:\\%(']], \ 'colorcolumn': [['', '8', '+2'], ['xxx']], \ 'comments': [['', 'b:#'], ['xxx']],