patch 8.1.1857: cannot use modifier with multi-byte character
Problem: Cannot use modifier with multi-byte character.
Solution: Allow using a multi-byte character, although it doesn't work
everywhere.
diff --git a/src/misc2.c b/src/misc2.c
index 463b37b..db3687d 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -2819,10 +2819,10 @@
l = mb_ptr2len(bp + 1);
else
l = 1;
- /* Anything accepted, like <C-?>.
- * <C-"> or <M-"> are not special in strings as " is
- * the string delimiter. With a backslash it works: <M-\"> */
- if (!(in_string && bp[1] == '"') && bp[2] == '>')
+ // Anything accepted, like <C-?>.
+ // <C-"> or <M-"> are not special in strings as " is
+ // the string delimiter. With a backslash it works: <M-\">
+ if (!(in_string && bp[1] == '"') && bp[l + 1] == '>')
bp += l;
else if (in_string && bp[1] == '\\' && bp[2] == '"'
&& bp[3] == '>')
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 71548ed..b189296 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -239,6 +239,12 @@
iunmap <M-">
endfunc
+func Test_map_meta_multibyte()
+ imap <M-á> foo
+ call assert_equal('foo', maparg("\<M-á>", 'i'))
+ iunmap <M-á>
+endfunc
+
func Test_abbr_after_line_join()
new
abbr foo bar
@@ -292,7 +298,7 @@
let g:val = 0
nnoremap \12 :let g:val = 1<CR>
nnoremap \123 :let g:val = 2<CR>
- set timeout timeoutlen=1000
+ set timeout timeoutlen=100
func ExitCb(job, status)
let g:timer = timer_start(1, {-> feedkeys("3\<Esc>", 't')})
diff --git a/src/version.c b/src/version.c
index f7be012..5bd944d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1857,
+/**/
1856,
/**/
1855,