aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-11-02 23:54:03 -0500
committerGitHub <noreply@github.com>2020-11-02 23:54:03 -0500
commit5b5848f2fb1f4b7995bb8a59d94b6766d2182070 (patch)
treef5dc85fabbcbee41f2a8ba7b358c0e8fdf31de21 /src
parent186ba3b68868dd35013b96b795ff17952b0853cb (diff)
parent0d9fa42d8304be0dca7601bb3f502b1ff3262790 (diff)
downloadrneovim-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}
Diffstat (limited to 'src')
-rw-r--r--src/nvim/mouse.c2
-rw-r--r--src/nvim/testdir/test_quickfix.vim4
2 files changed, 5 insertions, 1 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