diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-02-19 21:00:31 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-02-19 21:00:31 +0000 |
| commit | 997b8a015cd39141866e953651d55c705275cbd6 (patch) | |
| tree | 650d8de79484cd17178e80b84484ac9e2d437dce | |
| parent | 5b9f57262fdadf460e6355abf1eee95b4f96abe8 (diff) | |
| download | vim-git-997b8a015cd39141866e953651d55c705275cbd6.tar.gz | |
patch 9.0.1329: completion of map includes simplified onesv9.0.1329
Problem: Completion of map includes simplified ones.
Solution: Do not complete simplified mappings. (closes #12013)
| -rw-r--r-- | src/map.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_mapping.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 6 deletions
@@ -180,7 +180,7 @@ showmap( len = msg_outtrans_special(mp->m_keys, TRUE, 0); do { - msg_putchar(' '); // padd with blanks + msg_putchar(' '); // pad with blanks ++len; } while (len < 12); @@ -1445,7 +1445,7 @@ ExpandMappings( mp = maphash[hash]; for (; mp; mp = mp->m_next) { - if (!(mp->m_mode & expand_mapmodes)) + if (mp->m_simplified || !(mp->m_mode & expand_mapmodes)) continue; p = translate_mapping(mp->m_keys); diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim index 0390d4f1b..d631274d3 100644 --- a/src/testdir/test_mapping.vim +++ b/src/testdir/test_mapping.vim @@ -783,11 +783,12 @@ func Test_mapcomplete() call feedkeys(":abbr! \<C-A>\<C-B>\"\<CR>", 'tx') call assert_equal("\"abbr! \x01", @:) - " Multiple matches for a map - nmap ,f /H<CR> - omap ,f /H<CR> + " When multiple matches have the same {lhs}, it should only appear once. + " The simplified form should also not be included. + nmap ,<C-F> /H<CR> + omap ,<C-F> /H<CR> call feedkeys(":map ,\<C-A>\<C-B>\"\<CR>", 'tx') - call assert_equal('"map ,f', @:) + call assert_equal('"map ,<C-F>', @:) mapclear endfunc diff --git a/src/version.c b/src/version.c index 41726ea3e..d219f0fae 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1329, +/**/ 1328, /**/ 1327, |