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.1.0011: maparg() and mapcheck() confuse empty and non-existing (#8976)

Browse Source 
Problem:    maparg() and mapcheck() confuse empty and non-existing.
Solution:   Return <Nop> for an existing non-empty mapping. (closes vim/vim#2940)
f88a5bc102
This commit is contained in:
Jan Edmund Lazo 2018-09-10 03:27:04 -04:00 committed by Justin M. Keyes
parent d9fcd43638
commit 207cfce3de
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/eval.c
View File

@ -12145,8 +12145,12 @@ static void get_maparg(typval_T *argvars, typval_T *rettv, int exact)
if (!get_dict) { if (!get_dict) {
// Return a string. // Return a string.
if (rhs != NULL) { if (rhs != NULL) {
rettv->vval.v_string = (char_u *)str2special_save( if (*rhs == NUL) {
(const char *)rhs, false, false); rettv->vval.v_string = vim_strsave((char_u *)"<Nop>");
} else {
rettv->vval.v_string = (char_u *)str2special_save(
(char *)rhs, false, false);
}
} }
} else { } else {

8
src/nvim/testdir/test_maparg.vim
View File

@ -29,9 +29,13 @@ function Test_maparg()
\ maparg('foo', '', 0, 1)) \ maparg('foo', '', 0, 1))
map abc x<char-114>x map abc x<char-114>x
call assert_equal(maparg('abc'), "xrx") call assert_equal("xrx", maparg('abc'))
map abc y<S-char-114>y map abc y<S-char-114>y
call assert_equal(maparg('abc'), "yRy") call assert_equal("yRy", maparg('abc'))
map abc <Nop>
call assert_equal("<Nop>", maparg('abc'))
unmap abc
endfunction endfunction
function Test_range_map() function Test_range_map()