diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-04-11 13:31:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 13:31:05 +0200 |
| commit | b358054694765b595ff3ef64a5b0bba98628c218 (patch) | |
| tree | 9fa3588c03a633a70820f6dc025858946f877484 | |
| parent | 21b108fe445452e6e35621184fc77623dc64f9a3 (diff) | |
| parent | 5cf96fc14108812433b5abcab31568168bc50d57 (diff) | |
| download | rneovim-b358054694765b595ff3ef64a5b0bba98628c218.tar.gz rneovim-b358054694765b595ff3ef64a5b0bba98628c218.tar.bz2 rneovim-b358054694765b595ff3ef64a5b0bba98628c218.zip | |
Merge pull request #9880 from janlazo/vim-8.0.0725
closes #9879
| -rw-r--r-- | src/nvim/normal.c | 10 | ||||
| -rw-r--r-- | src/nvim/ops.c | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_window_cmd.vim | 5 |
3 files changed, 17 insertions, 2 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index abee28e37e..5217db5b42 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -6526,8 +6526,14 @@ static void n_start_visual_mode(int c) */ static void nv_window(cmdarg_T *cap) { - if (!checkclearop(cap->oap)) - do_window(cap->nchar, cap->count0, NUL); /* everything is in window.c */ + if (cap->nchar == ':') { + // "CTRL-W :" is the same as typing ":"; useful in a terminal window + cap->cmdchar = ':'; + cap->nchar = NUL; + nv_colon(cap); + } else if (!checkclearop(cap->oap)) { + do_window(cap->nchar, cap->count0, NUL); // everything is in window.c + } } /* diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 0ed96f0e57..79a7271819 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -153,6 +153,10 @@ int get_op_type(int char1, int char2) if (opchars[i][0] == char1 && opchars[i][1] == char2) { break; } + if (i == (int)(ARRAY_SIZE(opchars) - 1)) { + internal_error("get_op_type()"); + break; + } } return i; } diff --git a/src/nvim/testdir/test_window_cmd.vim b/src/nvim/testdir/test_window_cmd.vim index d3b496635d..003a23ea7b 100644 --- a/src/nvim/testdir/test_window_cmd.vim +++ b/src/nvim/testdir/test_window_cmd.vim @@ -691,4 +691,9 @@ func Test_winnr() only | tabonly endfunc +func Test_window_colon_command() + " This was reading invalid memory. + exe "norm! v\<C-W>:\<C-U>echo v:version" +endfunc + " vim: shiftwidth=2 sts=2 expandtab |