Patch 8.2.0904
Problem: Assuming modifyOtherKeys for rhs of mapping.
Solution: Ignore seenModifyOtherKeys for mapped characters. (closes #6200)
Files: src/getchar.c, src/testdir/test_gui.vim
*** ../vim-8.2.0903/src/getchar.c 2020-05-30 19:52:42.270340843 +0200
--- src/getchar.c 2020-06-04 22:16:59.734541300 +0200
***************
*** 2355,2361 ****
// Skip ":lmap" mappings if keys were mapped.
if (mp->m_keys[0] == tb_c1
&& (mp->m_mode & local_State)
! && !(mp->m_simplified && seenModifyOtherKeys)
&& ((mp->m_mode & LANGMAP) == 0 || typebuf.tb_maplen == 0))
{
#ifdef FEAT_LANGMAP
--- 2355,2362 ----
// Skip ":lmap" mappings if keys were mapped.
if (mp->m_keys[0] == tb_c1
&& (mp->m_mode & local_State)
! && !(mp->m_simplified && seenModifyOtherKeys
! && typebuf.tb_maplen == 0)
&& ((mp->m_mode & LANGMAP) == 0 || typebuf.tb_maplen == 0))
{
#ifdef FEAT_LANGMAP
*** ../vim-8.2.0903/src/testdir/test_gui.vim 2020-05-22 13:33:58.203383951
+0200
--- src/testdir/test_gui.vim 2020-06-04 22:16:15.162706300 +0200
***************
*** 856,859 ****
--- 856,869 ----
let &guioptions = save_guioptions
endfunc
+ func Test_gui_recursive_mapping()
+ nmap ' <C-W>
+ nmap <C-W>a :let didit = 1<CR>
+ call feedkeys("'a", 'xt')
+ call assert_equal(1, didit)
+
+ nunmap '
+ nunmap <C-W>a
+ endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.0903/src/version.c 2020-06-04 21:32:45.609859932 +0200
--- src/version.c 2020-06-04 22:12:22.199580116 +0200
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 904,
/**/
--
ARTHUR: (as the MAN next to him is squashed by a sheep) Knights! Run away!
Midst echoing shouts of "run away" the KNIGHTS retreat to cover with the odd
cow or goose hitting them still. The KNIGHTS crouch down under cover.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
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 [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/202006042022.054KMgMC836659%40masaka.moolenaar.net.
