diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-07-03 06:43:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-03 06:43:16 +0800 |
| commit | e837f29ce6c7784340ae2cd866aa239462d3920c (patch) | |
| tree | b77391d7a4028cc34c9ffa60c8b7d40189f55a87 | |
| parent | 2b04aaad945a5bf1d5feb419d0b53c421d83f394 (diff) | |
| parent | 357d63f5d799aa49068ed4fdc941b7a39f775365 (diff) | |
| download | rneovim-e837f29ce6c7784340ae2cd866aa239462d3920c.tar.gz rneovim-e837f29ce6c7784340ae2cd866aa239462d3920c.tar.bz2 rneovim-e837f29ce6c7784340ae2cd866aa239462d3920c.zip | |
Merge pull request #19212 from zeertzjq/vim-9.0.0024
vim-patch:9.0.{0024,0030}
| -rw-r--r-- | src/nvim/getchar.c | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_matchfuzzy.vim | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 6fdc10ae0b..c3dbb02dce 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -1804,7 +1804,8 @@ static int handle_mapping(int *keylenp, bool *timedout, int *mapdepth) bool is_plug_map = false; // If typehead starts with <Plug> then remap, even for a "noremap" mapping. - if (typebuf.tb_buf[typebuf.tb_off] == K_SPECIAL + if (typebuf.tb_len >= 3 + && typebuf.tb_buf[typebuf.tb_off] == K_SPECIAL && typebuf.tb_buf[typebuf.tb_off + 1] == KS_EXTRA && typebuf.tb_buf[typebuf.tb_off + 2] == KE_PLUG) { is_plug_map = true; diff --git a/src/nvim/testdir/test_matchfuzzy.vim b/src/nvim/testdir/test_matchfuzzy.vim index 6b4949ad8c..c836bc87aa 100644 --- a/src/nvim/testdir/test_matchfuzzy.vim +++ b/src/nvim/testdir/test_matchfuzzy.vim @@ -59,7 +59,7 @@ func Test_matchfuzzy() %bw! eval ['somebuf', 'anotherone', 'needle', 'yetanotherone']->map({_, v -> bufadd(v) + bufload(v)}) - let l = getbufinfo()->map({_, v -> v.name})->matchfuzzy('ndl') + let l = getbufinfo()->map({_, v -> fnamemodify(v.name, ':t')})->matchfuzzy('ndl') call assert_equal(1, len(l)) call assert_match('needle', l[0]) |