IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4819: unmapping simplified keys also deletes other mapping

Browse Source 
Problem:    Unmapping simplified keys also deletes other mapping.
Solution:   Only unmap a mapping with m_simplified set. (closes vim/vim#10270)
a4e3332650
This commit is contained in:
zeertzjq 2022-04-27 20:21:04 +08:00
parent 04a437b280
commit c14d89f306
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/getchar.c
View File

@ -3248,6 +3248,9 @@ int buf_do_map(int maptype, MapArguments *args, int mode, bool is_abbrev, buf_T
mpp = &(mp->m_next); mpp = &(mp->m_next);
continue; continue;
} }
if (did_simplify && keyround == 1 && !mp->m_simplified) {
break;
}
// We reset the indicated mode bits. If nothing // We reset the indicated mode bits. If nothing
// is left the entry is deleted below. // is left the entry is deleted below.
mp->m_mode &= ~mode; mp->m_mode &= ~mode;
@ -3319,7 +3322,9 @@ int buf_do_map(int maptype, MapArguments *args, int mode, bool is_abbrev, buf_T
if (maptype == 1) { if (maptype == 1) {
// delete entry // delete entry
if (!did_it) { if (!did_it) {
retval = 2; // no match if (!did_simplify || keyround == 2) {
retval = 2; // no match
}
} else if (*lhs == Ctrl_C) { } else if (*lhs == Ctrl_C) {
// If CTRL-C has been unmapped, reuse it for Interrupting. // If CTRL-C has been unmapped, reuse it for Interrupting.
if (map_table == buf->b_maphash) { if (map_table == buf->b_maphash) {

11
src/nvim/testdir/test_mapping.vim
View File

@ -761,4 +761,15 @@ func Test_mouse_drag_insert_map()
set mouse& set mouse&
endfunc endfunc
func Test_unmap_simplfied()
map <C-I> foo
map <Tab> bar
call assert_equal('foo', maparg('<C-I>'))
call assert_equal('bar', maparg('<Tab>'))
unmap <C-I>
call assert_equal('', maparg('<C-I>'))
call assert_equal('bar', maparg('<Tab>'))
unmap <Tab>
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab