patch 9.1.1619: Incorrect E535 error message Commit: https://github.com/vim/vim/commit/b362995430ee809f866d74930897bc158a4eb4ca Author: zeertzjq <zeert...@outlook.com> Date: Sun Aug 10 09:41:50 2025 +0200
patch 9.1.1619: Incorrect E535 error message 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 <zeert...@outlook.com> Signed-off-by: Christian Brabandt <c...@256bit.org> diff --git a/src/optionstr.c b/src/optionstr.c index 06b655e31..03cf4391c 100644 --- a/src/optionstr.c +++ b/src/optionstr.c @@ -257,8 +257,7 @@ illegal_char_after_chr(char *errbuf, size_t errbuflen, int c) { if (errbuf == NULL) return ""; - vim_snprintf(errbuf, errbuflen, _(e_illegal_character_after_chr), - (char *)transchar(c)); + vim_snprintf(errbuf, errbuflen, _(e_illegal_character_after_chr), c); return errbuf; } diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim index 6964a537e..9acee8fe3 100644 --- a/src/testdir/test_ins_complete.vim +++ b/src/testdir/test_ins_complete.vim @@ -5395,7 +5395,7 @@ func s:TestCompleteScriptLocal(findstart, base) endfunc " Issue 17869 -func Test_scriplocal_autoload_func() +func Test_scriptlocal_autoload_func() let save_rtp = &rtp set rtp=Xruntime/some let dir = 'Xruntime/some/autoload' diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim index 7353208ab..f6da0a8a6 100644 --- a/src/testdir/test_options.vim +++ b/src/testdir/test_options.vim @@ -267,17 +267,17 @@ func Test_complete() new call feedkeys("i\<C-N>\<Esc>", 'xt') bwipe! - call assert_fails('set complete=ix', 'E535:') - call assert_fails('set complete=x', 'E539:') - call assert_fails('set complete=..', 'E535:') + call assert_fails('set complete=ix', 'E535: Illegal character after <i>') + call assert_fails('set complete=x', 'E539: Illegal character <x>') + call assert_fails('set complete=..', 'E535: Illegal character after <.>') 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^x', 'E535:') - call assert_fails('set complete=k^2,t^-1,s^', 'E535:') - call assert_fails('set complete=t^-1', 'E535:') - call assert_fails('set complete=kfoo^foo2', 'E535:') - call assert_fails('set complete=kfoo^', 'E535:') - call assert_fails('set complete=.^', 'E535:') + call assert_fails('set complete=i^-10', 'E535: Illegal character after <^>') + call assert_fails('set complete=i^x', 'E535: Illegal character after <^>') + call assert_fails('set complete=k^2,t^-1,s^', 'E535: Illegal character after <^>') + call assert_fails('set complete=t^-1', 'E535: Illegal character after <^>') + call assert_fails('set complete=kfoo^foo2', 'E535: Illegal character after <^>') + call assert_fails('set complete=kfoo^', 'E535: Illegal character after <^>') + call assert_fails('set complete=.^', 'E535: Illegal character after <^>') set complete=.,w,b,u,k,s,i,d,],t,U,F,o set complete=. set complete=.^10,t^0 diff --git a/src/version.c b/src/version.c index e61d4fc81..2b54b81e3 100644 --- a/src/version.c +++ b/src/version.c @@ -719,6 +719,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1619, /**/ 1618, /**/ -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/vim_dev/E1ul0jp-0061fR-8v%40256bit.org.