diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-01-15 22:10:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 22:10:05 +0100 |
| commit | 900708f93b16d8d78f107e2b9ee16ae20f3e55b1 (patch) | |
| tree | 2fb238118edd68e64dd91e943721d0e08c844b95 /src/nvim/getchar.c | |
| parent | 7dd3910f47621dd422e8c37ad16512295a11f5cc (diff) | |
| parent | 808f5043055f9bd2f083befc0d50f00b0ffb5c25 (diff) | |
| download | rneovim-900708f93b16d8d78f107e2b9ee16ae20f3e55b1.tar.gz rneovim-900708f93b16d8d78f107e2b9ee16ae20f3e55b1.tar.bz2 rneovim-900708f93b16d8d78f107e2b9ee16ae20f3e55b1.zip | |
Merge #7855 from ckelsel/vim-8.0.0398
Diffstat (limited to 'src/nvim/getchar.c')
| -rw-r--r-- | src/nvim/getchar.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 1b5d3472ab..7df1bf8429 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -3366,6 +3366,10 @@ set_context_in_map_cmd ( arg = skipwhite(arg + 8); continue; } + if (STRNCMP(arg, "<special>", 9) == 0) { + arg = skipwhite(arg + 9); + continue; + } if (STRNCMP(arg, "<script>", 8) == 0) { arg = skipwhite(arg + 8); continue; @@ -3408,21 +3412,24 @@ int ExpandMappings(regmatch_T *regmatch, int *num_file, char_u ***file) for (round = 1; round <= 2; ++round) { count = 0; - for (i = 0; i < 6; ++i) { - if (i == 0) + for (i = 0; i < 7; i++) { + if (i == 0) { p = (char_u *)"<silent>"; - else if (i == 1) + } else if (i == 1) { p = (char_u *)"<unique>"; - else if (i == 2) + } else if (i == 2) { p = (char_u *)"<script>"; - else if (i == 3) + } else if (i == 3) { p = (char_u *)"<expr>"; - else if (i == 4 && !expand_buffer) + } else if (i == 4 && !expand_buffer) { p = (char_u *)"<buffer>"; - else if (i == 5) + } else if (i == 5) { p = (char_u *)"<nowait>"; - else + } else if (i == 6) { + p = (char_u *)"<special>"; + } else { continue; + } if (vim_regexec(regmatch, p, (colnr_T)0)) { if (round == 1) |