diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-02 23:54:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-02 23:54:03 -0500 |
| commit | 5b5848f2fb1f4b7995bb8a59d94b6766d2182070 (patch) | |
| tree | f5dc85fabbcbee41f2a8ba7b358c0e8fdf31de21 | |
| parent | 186ba3b68868dd35013b96b795ff17952b0853cb (diff) | |
| parent | 0d9fa42d8304be0dca7601bb3f502b1ff3262790 (diff) | |
| download | rneovim-5b5848f2fb1f4b7995bb8a59d94b6766d2182070.tar.gz rneovim-5b5848f2fb1f4b7995bb8a59d94b6766d2182070.tar.bz2 rneovim-5b5848f2fb1f4b7995bb8a59d94b6766d2182070.zip | |
Merge pull request #13209 from janlazo/vim-8.2.1942
vim-patch:8.2.{1165,1942}
| -rw-r--r-- | src/nvim/mouse.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_quickfix.vim | 4 | ||||
| -rw-r--r-- | test/functional/lua/overrides_spec.lua | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c index d8ff83f479..748001dcec 100644 --- a/src/nvim/mouse.c +++ b/src/nvim/mouse.c @@ -450,7 +450,7 @@ bool mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump) // skip line number and fold column in front of the line col -= win_col_off(win); - if (col < 0) { + if (col <= 0) { col = 0; } diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim index cf0af07528..049163890e 100644 --- a/src/nvim/testdir/test_quickfix.vim +++ b/src/nvim/testdir/test_quickfix.vim @@ -3602,6 +3602,10 @@ func Test_lhelpgrep_autocmd() au BufEnter * call setqflist([], 'f') augroup END call assert_fails('helpgrep quickfix', 'E925:') + " run the test with a help window already open + help + wincmd w + call assert_fails('helpgrep quickfix', 'E925:') augroup QF_Test au! BufEnter augroup END diff --git a/test/functional/lua/overrides_spec.lua b/test/functional/lua/overrides_spec.lua index 5fbba63736..267c759faf 100644 --- a/test/functional/lua/overrides_spec.lua +++ b/test/functional/lua/overrides_spec.lua @@ -3,7 +3,6 @@ local helpers = require('test.functional.helpers')(after_each) local Screen = require('test.functional.ui.screen') local eq = helpers.eq -local neq = helpers.neq local NIL = helpers.NIL local feed = helpers.feed local clear = helpers.clear @@ -13,7 +12,6 @@ local iswin = helpers.iswin local command = helpers.command local write_file = helpers.write_file local redir_exec = helpers.redir_exec -local alter_slashes = helpers.alter_slashes local exec_lua = helpers.exec_lua local screen |