diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 94671d17cb..49087d3732 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 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 short description can be found at |Q_op|. 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=\" - :exe "set cedit=\" + type. The preferred way is to use |key-notation| (e.g. , ) or + a letter preceded with a caret (e.g. `^F` is CTRL-F). Examples: > + :set cedit=^Y + :set cedit= < |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' diff --git a/src/ex_getln.c b/src/ex_getln.c index ef7ca9186d..9d0695a966 100644 --- 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; } diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim index 7674714837..c601158c23 100644 --- 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': [['', '\'], ['xxx', 'f']], + \ 'cedit': [['', '^Y', ''], ['xxx', 'f', '']], \ 'clipboard': [['', 'unnamed', 'autoselect,unnamed', 'html', 'exclude:vimdisplay'], ['xxx', '\ze*', 'exclude:\\%(']], \ 'colorcolumn': [['', '8', '+2'], ['xxx']], \ 'comments': [['', 'b:#'], ['xxx']], diff --git a/src/version.c b/src/version.c index c6651c720c..37435658fe 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 */ +/**/ + 752, /**/ 751, /**/