adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1619: Incorrect E535 error message

Browse Source 
Problem:  Incorrect E535 error message (after 9.1.1603).
Solution: Don't use transchar(), as the character is always printable
          (zeertzjq).

closes: #17948

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2025-08-10 09:41:50 +02:00
committed by Christian Brabandt
parent fc3c204bbe
commit b362995430
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/optionstr.c
View File

@ -257,8 +257,7 @@ illegal_char_after_chr(char *errbuf, size_t errbuflen, int c)
{ {
if (errbuf == NULL) if (errbuf == NULL)
return ""; return "";
vim_snprintf(errbuf, errbuflen, _(e_illegal_character_after_chr), vim_snprintf(errbuf, errbuflen, _(e_illegal_character_after_chr), c);
(char *)transchar(c));
return errbuf; return errbuf;
} }

2
src/testdir/test_ins_complete.vim
View File

@ -5395,7 +5395,7 @@ func s:TestCompleteScriptLocal(findstart, base)
endfunc endfunc
" Issue 17869 " Issue 17869
func Test_scriplocal_autoload_func() func Test_scriptlocal_autoload_func()
let save_rtp = &rtp let save_rtp = &rtp
set rtp=Xruntime/some set rtp=Xruntime/some
let dir = 'Xruntime/some/autoload' let dir = 'Xruntime/some/autoload'

20
src/testdir/test_options.vim
View File

@ -267,17 +267,17 @@ func Test_complete()
new new
call feedkeys("i\<C-N>\<Esc>", 'xt') call feedkeys("i\<C-N>\<Esc>", 'xt')
bwipe! bwipe!
call assert_fails('set complete=ix', 'E535:') call assert_fails('set complete=ix', 'E535: Illegal character after <i>')
call assert_fails('set complete=x', 'E539:') call assert_fails('set complete=x', 'E539: Illegal character <x>')
call assert_fails('set complete=..', 'E535:') call assert_fails('set complete=..', 'E535: Illegal character after <.>')
set complete=.,w,b,u,k,\ s,i,d,],t,U,F,o set complete=.,w,b,u,k,\ s,i,d,],t,U,F,o
call assert_fails('set complete=i^-10', 'E535:') call assert_fails('set complete=i^-10', 'E535: Illegal character after <^>')
call assert_fails('set complete=i^x', 'E535:') call assert_fails('set complete=i^x', 'E535: Illegal character after <^>')
call assert_fails('set complete=k^2,t^-1,s^', 'E535:') call assert_fails('set complete=k^2,t^-1,s^', 'E535: Illegal character after <^>')
call assert_fails('set complete=t^-1', 'E535:') call assert_fails('set complete=t^-1', 'E535: Illegal character after <^>')
call assert_fails('set complete=kfoo^foo2', 'E535:') call assert_fails('set complete=kfoo^foo2', 'E535: Illegal character after <^>')
call assert_fails('set complete=kfoo^', 'E535:') call assert_fails('set complete=kfoo^', 'E535: Illegal character after <^>')
call assert_fails('set complete=.^', 'E535:') call assert_fails('set complete=.^', 'E535: Illegal character after <^>')
set complete=.,w,b,u,k,s,i,d,],t,U,F,o set complete=.,w,b,u,k,s,i,d,],t,U,F,o
set complete=. set complete=.
set complete=.^10,t^0 set complete=.^10,t^0

2
src/version.c
View File

@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1619,
/**/ /**/
1618, 1618,
/**/ /**/