diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-03-08 20:57:58 -0500 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-03-09 18:38:04 -0500 |
| commit | f7f71465884582deb64e961c83ac0100e5af2c8c (patch) | |
| tree | 60fa8b81ef0c03f549365fe3dbfe26e8ecb0d73d | |
| parent | e355cc8cc5c131e6df429107f321dd4a80c05065 (diff) | |
| download | rneovim-f7f71465884582deb64e961c83ac0100e5af2c8c.tar.gz rneovim-f7f71465884582deb64e961c83ac0100e5af2c8c.tar.bz2 rneovim-f7f71465884582deb64e961c83ac0100e5af2c8c.zip | |
vim-patch:8.2.2577: compiler warning for type conversion
Problem: Compiler warning for type conversion.
Solution: Add a typecast. (Mike Williams)
https://github.com/vim/vim/commit/9355ae41497cbcce58ddd79f9125eb3e9dfe0a43
N/A patches for version.c:
vim-patch:8.1.0783: compiler warning for signed/unsigned
Problem: Compiler warning for signed/unsigned.
Solution: Add type cast. Change type of buffer. (Ozaki Kiichi, closes vim/vim#3827)
https://github.com/vim/vim/commit/63c0ccd2b68ce854f294e6f149cc700c7f543674
Neovim was refactored to prefer char type for string functions, not char_u.
vim-patch:8.2.2152: screenpos() does not include the WinBar offset
Problem: screenpos() does not include the WinBar offset.
Solution: Use W_WINROW() instead of directly using w_window. (closes vim/vim#7487)
https://github.com/vim/vim/commit/8dd46e72cfb13b8de793c808ee009c45e881903a
W_WINROW() was removed so port only the test changes.
The test is currently skipped.
| -rw-r--r-- | src/nvim/screen.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_cursor_func.vim | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 20e3cc0a2e..47f1cb6423 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -2656,7 +2656,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, // already be in use. xfree(p_extra_free); p_extra_free = xmalloc(MAX_MCO * fdc + 1); - n_extra = fill_foldcolumn(p_extra_free, wp, foldinfo, lnum); + n_extra = (int)fill_foldcolumn(p_extra_free, wp, foldinfo, lnum); p_extra_free[n_extra] = NUL; p_extra = p_extra_free; c_extra = NUL; diff --git a/src/nvim/testdir/test_cursor_func.vim b/src/nvim/testdir/test_cursor_func.vim index 2e190911b2..53b7da517e 100644 --- a/src/nvim/testdir/test_cursor_func.vim +++ b/src/nvim/testdir/test_cursor_func.vim @@ -92,6 +92,11 @@ func Test_screenpos() \ 'endcol': wincol + 9}, screenpos(winid, 2, 22)) close bwipe! + + call assert_equal({'col': 1, 'row': 1, 'endcol': 1, 'curscol': 1}, screenpos(win_getid(), 1, 1)) + nmenu WinBar.TEST : + call assert_equal({'col': 1, 'row': 2, 'endcol': 1, 'curscol': 1}, screenpos(win_getid(), 1, 1)) + nunmenu WinBar.TEST endfunc func Test_screenpos_number() |