Skip to content

Commit b362995

Browse files
zeertzjqchrisbra
authored andcommitted
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 <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent fc3c204 commit b362995

4 files changed

Lines changed: 14 additions & 13 deletions

File tree

src/optionstr.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ illegal_char_after_chr(char *errbuf, size_t errbuflen, int c)
257257
{
258258
if (errbuf == NULL)
259259
return "";
260-
vim_snprintf(errbuf, errbuflen, _(e_illegal_character_after_chr),
261-
(char *)transchar(c));
260+
vim_snprintf(errbuf, errbuflen, _(e_illegal_character_after_chr), c);
262261
return errbuf;
263262
}
264263

src/testdir/test_ins_complete.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5395,7 +5395,7 @@ func s:TestCompleteScriptLocal(findstart, base)
53955395
endfunc
53965396

53975397
" Issue 17869
5398-
func Test_scriplocal_autoload_func()
5398+
func Test_scriptlocal_autoload_func()
53995399
let save_rtp = &rtp
54005400
set rtp=Xruntime/some
54015401
let dir = 'Xruntime/some/autoload'

src/testdir/test_options.vim

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -267,17 +267,17 @@ func Test_complete()
267267
new
268268
call feedkeys("i\<C-N>\<Esc>", 'xt')
269269
bwipe!
270-
call assert_fails('set complete=ix', 'E535:')
271-
call assert_fails('set complete=x', 'E539:')
272-
call assert_fails('set complete=..', 'E535:')
270+
call assert_fails('set complete=ix', 'E535: Illegal character after <i>')
271+
call assert_fails('set complete=x', 'E539: Illegal character <x>')
272+
call assert_fails('set complete=..', 'E535: Illegal character after <.>')
273273
set complete=.,w,b,u,k,\ s,i,d,],t,U,F,o
274-
call assert_fails('set complete=i^-10', 'E535:')
275-
call assert_fails('set complete=i^x', 'E535:')
276-
call assert_fails('set complete=k^2,t^-1,s^', 'E535:')
277-
call assert_fails('set complete=t^-1', 'E535:')
278-
call assert_fails('set complete=kfoo^foo2', 'E535:')
279-
call assert_fails('set complete=kfoo^', 'E535:')
280-
call assert_fails('set complete=.^', 'E535:')
274+
call assert_fails('set complete=i^-10', 'E535: Illegal character after <^>')
275+
call assert_fails('set complete=i^x', 'E535: Illegal character after <^>')
276+
call assert_fails('set complete=k^2,t^-1,s^', 'E535: Illegal character after <^>')
277+
call assert_fails('set complete=t^-1', 'E535: Illegal character after <^>')
278+
call assert_fails('set complete=kfoo^foo2', 'E535: Illegal character after <^>')
279+
call assert_fails('set complete=kfoo^', 'E535: Illegal character after <^>')
280+
call assert_fails('set complete=.^', 'E535: Illegal character after <^>')
281281
set complete=.,w,b,u,k,s,i,d,],t,U,F,o
282282
set complete=.
283283
set complete=.^10,t^0

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,8 @@ static char *(features[]) =
719719

720720
static int included_patches[] =
721721
{ /* Add new patch number below this line */
722+
/**/
723+
1619,
722724
/**/
723725
1618,
724726
/**/

0 commit comments

Comments
 (0)