diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-05-21 13:28:44 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-05-21 13:28:44 +0200 |
| commit | f88a5bc10232cc3fac92dba4e8455f4c14311f8e (patch) | |
| tree | b4f2ad73bb4be2f42477dc5811de46ccb001e8ee /src/evalfunc.c | |
| parent | 6bff719f7e472e918c60aa336de03e799b806c4f (diff) | |
patch 8.1.0011: maparg() and mapcheck() confuse empty and non-existingv8.1.0011
Problem: maparg() and mapcheck() confuse empty and non-existing.
Solution: Return <Nop> for an existing non-empty mapping. (closes #2940)
Diffstat (limited to 'src/evalfunc.c')
| -rw-r--r-- | src/evalfunc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 5cee976d35..46e55b3fd2 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -7383,7 +7383,12 @@ get_maparg(typval_T *argvars, typval_T *rettv, int exact) { /* Return a string. */ if (rhs != NULL) - rettv->vval.v_string = str2special_save(rhs, FALSE); + { + if (*rhs == NUL) + rettv->vval.v_string = vim_strsave((char_u *)"<Nop>"); + else + rettv->vval.v_string = str2special_save(rhs, FALSE); + } } else if (rettv_dict_alloc(rettv) != FAIL && rhs != NULL) |