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 <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/optionstr.c b/src/optionstr.c
index 06b655e317f251c11c038dfcd80753bd1b2a7d7c..03cf4391ccdcaa3da5a1950be46a598aefb02677 100644 (file)
--- 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 6964a537e9a14b9911a477693883b9d8e6919456..9acee8fe339809730aa91ea7fa87811dd90337b5 100644 (file)
--- 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 7353208ab09461b2213f08b4b728d25db32b0d9a..f6da0a8a6088abd3cf384b3626a9b9fbc277b463 100644 (file)
--- 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 e61d4fc81a0d078f4456515f06aef6ba352374e9..2b54b81e397858fd5ccc9f1d3aec4209ba607859 100644 (file)
--- 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,
 /**/