patch 9.1.0759: screenpos() may return invalid position
Commit:
https://github.com/vim/vim/commit/b065a10e245d020c11b521a2a5062300ca9891fc
Author: Christian Brabandt <[email protected]>
Date: Sat Oct 5 17:30:22 2024 +0200
patch 9.1.0759: screenpos() may return invalid position
Problem: screenpos() may return invalid position
after switching buffers (Greg Hurrell)
Solution: reset w_leftcol if wrapping has been set
after copying wrap option
fixes: #15792
closes: #15803
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/option.c b/src/option.c
index b38d77f5a..df0b647c0 100644
--- a/src/option.c
+++ b/src/option.c
@@ -6737,6 +6737,11 @@ win_copy_options(win_T *wp_from, win_T *wp_to)
void
after_copy_winopt(win_T *wp)
{
+ // Set w_leftcol or w_skipcol to zero.
+ if (wp->w_p_wrap)
+ wp->w_leftcol = 0;
+ else
+ wp->w_skipcol = 0;
#ifdef FEAT_LINEBREAK
briopt_check(wp);
#endif
diff --git a/src/testdir/test_cursor_func.vim b/src/testdir/test_cursor_func.vim
index 2bdda869e..8766f97d9 100644
--- a/src/testdir/test_cursor_func.vim
+++ b/src/testdir/test_cursor_func.vim
@@ -279,6 +279,21 @@ func Test_screenpos_number()
bwipe!
endfunc
+func Test_screenpos_edit_newfile()
+ new
+ 20vsp
+ setl nowrap
+ call setline(1, 'abcdefghijklmnopqrstuvwxyz')
+ call cursor(1, 10)
+ norm! 5zl
+ call assert_equal(#{col: 5, row: 1, endcol: 5, curscol: 5},
screenpos(win_getid(), 1, 10))
+ enew!
+ call assert_equal(1, &l:wrap)
+ call assert_equal(#{col: 1, row: 1, endcol: 1, curscol: 1},
screenpos(win_getid(), 1, 1))
+
+ bwipe!
+endfunc
+
" Save the visual start character position
func SaveVisualStartCharPos()
call add(g:VisualStartPos, getcharpos('v'))
diff --git a/src/version.c b/src/version.c
index 047db755e..63a6bc087 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 759,
/**/
758,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1sx6xr-00Dbw5-2B%40256bit.org.
