thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.2159: some mappings are listed twice

Browse Source 
Problem:    Some mappings are listed twice.
Solution:   Skip mappings duplicated for modifyOtherKeys. (closes #5064)
This commit is contained in:
Bram Moolenaar
2019-10-16 18:34:57 +02:00
parent 17efc7fa05
commit fafb4b18cd
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/map.c
View File

@@ -554,7 +554,7 @@ do_map(
for ( ; mp != NULL && !got_int; mp = mp->m_next)
{
// check entries with the same mode
if ((mp->m_mode & mode) != 0)
if (!mp->m_simplified && (mp->m_mode & mode) != 0)
{
if (!haskey) // show all entries
{
@@ -599,15 +599,19 @@ do_map(
for (mp = *mpp; mp != NULL && !got_int; mp = *mpp)
{
if (!(mp->m_mode & mode)) // skip entries with wrong mode
if ((mp->m_mode & mode) == 0)
{
// skip entries with wrong mode
mpp = &(mp->m_next);
continue;
}
if (!haskey) // show all entries
{
showmap(mp, map_table != maphash);
did_it = TRUE;
if (!mp->m_simplified)
{
showmap(mp, map_table != maphash);
did_it = TRUE;
}
}
else // do we have a match?
{
@@ -643,8 +647,11 @@ do_map(
}
else if (!hasarg) // show matching entry
{
showmap(mp, map_table != maphash);
did_it = TRUE;
if (!mp->m_simplified)
{
showmap(mp, map_table != maphash);
did_it = TRUE;
}
}
else if (n != len) // new entry is ambiguous
{