diff options
| author | Ernie Rael <errael@raelity.com> | 2022-05-10 17:50:39 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-10 17:50:39 +0100 |
| commit | d8f5f766219273a8579947cc80b92580b6988a4b (patch) | |
| tree | 5325cef40d2b8f102fb71625056681e0d88e8515 /src | |
| parent | 0f267621c04883de010a6379217a5f182cc03dda (diff) | |
| download | vim-git-8.2.4932.tar.gz | |
patch 8.2.4932: not easy to filter the output of maplist()v8.2.4932
Problem: Not easy to filter the output of maplist().
Solution: Add mode_bits to the dictionary. (Ernie Rael, closes #10356)
Diffstat (limited to 'src')
| -rw-r--r-- | src/map.c | 1 | ||||
| -rw-r--r-- | src/testdir/test_map_functions.vim | 10 | ||||
| -rw-r--r-- | src/testdir/test_vim9_builtin.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 6 deletions
@@ -2303,6 +2303,7 @@ mapblock2dict( dict_add_number(dict, "nowait", mp->m_nowait ? 1L : 0L); dict_add_string(dict, "mode", mapmode); dict_add_number(dict, "abbr", abbr ? 1L : 0L); + dict_add_number(dict, "mode_bits", mp->m_mode); vim_free(mapmode); } diff --git a/src/testdir/test_map_functions.vim b/src/testdir/test_map_functions.vim index e13807647..d8c079c84 100644 --- a/src/testdir/test_map_functions.vim +++ b/src/testdir/test_map_functions.vim @@ -19,13 +19,13 @@ func Test_maparg() \ 'lhsraw': "foo\x80\xfc\x04V", 'lhsrawalt': "foo\x16", \ 'mode': ' ', 'nowait': 0, 'expr': 0, 'sid': sid, 'scriptversion': 1, \ 'lnum': lnum + 1, - \ 'rhs': 'is<F4>foo', 'buffer': 0, 'abbr': 0}, + \ 'rhs': 'is<F4>foo', 'buffer': 0, 'abbr': 0, 'mode_bits': 0x47}, \ maparg('foo<C-V>', '', 0, 1)) call assert_equal({'silent': 1, 'noremap': 1, 'script': 1, 'lhs': 'bar', \ 'lhsraw': 'bar', 'mode': 'v', \ 'nowait': 0, 'expr': 1, 'sid': sid, 'scriptversion': 1, \ 'lnum': lnum + 2, - \ 'rhs': 'isbar', 'buffer': 1, 'abbr': 0}, + \ 'rhs': 'isbar', 'buffer': 1, 'abbr': 0, 'mode_bits': 0x42}, \ 'bar'->maparg('', 0, 1)) let lnum = expand('<sflnum>') map <buffer> <nowait> foo bar @@ -33,7 +33,7 @@ func Test_maparg() \ 'lhsraw': 'foo', 'mode': ' ', \ 'nowait': 1, 'expr': 0, 'sid': sid, 'scriptversion': 1, \ 'lnum': lnum + 1, 'rhs': 'bar', - \ 'buffer': 1, 'abbr': 0}, + \ 'buffer': 1, 'abbr': 0, 'mode_bits': 0x47}, \ maparg('foo', '', 0, 1)) let lnum = expand('<sflnum>') tmap baz foo @@ -41,7 +41,7 @@ func Test_maparg() \ 'lhsraw': 'baz', 'mode': 't', \ 'nowait': 0, 'expr': 0, 'sid': sid, 'scriptversion': 1, \ 'lnum': lnum + 1, 'rhs': 'foo', - \ 'buffer': 0, 'abbr': 0}, + \ 'buffer': 0, 'abbr': 0, 'mode_bits': 0x80}, \ maparg('baz', 't', 0, 1)) let lnum = expand('<sflnum>') iab A B @@ -49,7 +49,7 @@ func Test_maparg() \ 'lhsraw': 'A', 'mode': 'i', \ 'nowait': 0, 'expr': 0, 'sid': sid, 'scriptversion': 1, \ 'lnum': lnum + 1, 'rhs': 'B', - \ 'buffer': 0, 'abbr': 1}, + \ 'buffer': 0, 'abbr': 1, 'mode_bits': 0x0010}, \ maparg('A', 'i', 1, 1)) iuna A diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index 2c4e9ae99..3405d9e53 100644 --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -2464,7 +2464,8 @@ def Test_maparg() scriptversion: 999999, rhs: 'bar', buffer: 0, - abbr: 0}) + abbr: 0, + mode_bits: 0x47}) unmap foo v9.CheckDefAndScriptFailure(['maparg(1)'], ['E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1']) v9.CheckDefAndScriptFailure(['maparg("a", 2)'], ['E1013: Argument 2: type mismatch, expected string but got number', 'E1174: String required for argument 2']) diff --git a/src/version.c b/src/version.c index 97fbf1717..e7affba03 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4932, +/**/ 4931, /**/ 4930, |