patch 9.0.1705: cursor position wrong when clicking on an unprintable char

[Christian Brabandt]

patch 9.0.1705: cursor position wrong when clicking on an unprintable char

Commit: https://github.com/vim/vim/commit/b25dbb3f9b5885dd623af7a9fae890b8366b64e2
Author: zeertzjq <zeer...@outlook.com>
Date: Sun Aug 13 18:11:05 2023 +0200

patch 9.0.1705: cursor position wrong when clicking on an unprintable char

Problem: cursor position wrong when clicking on an unprintable char
Solution: Don't update prev_ptr when wlv.n_extra is not zero.

closes: #12664

Signed-off-by: Christian Brabandt <c...@256bit.org>
Co-authored-by: zeertzjq <zeer...@outlook.com>

diff --git a/src/drawline.c b/src/drawline.c
index 9d6ee8d8d..ef9f66371 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -1829,10 +1829,10 @@ win_line(

win_line_start(wp, &wlv, FALSE);

+ char_u *prev_ptr = ptr;
// Repeat for the whole displayed line.
for (;;)
{
- char_u *prev_ptr = ptr;
#if defined(FEAT_CONCEAL) || defined(FEAT_SEARCH_EXTRA)
int has_match_conc = 0; // match wants to conceal
#endif
@@ -2261,9 +2261,9 @@ win_line(
}
#endif

-#ifdef FEAT_SEARCH_EXTRA
if (wlv.n_extra == 0)
{
+#ifdef FEAT_SEARCH_EXTRA
// Check for start/end of 'hlsearch' and other matches.
// After end, check for start/end of next match.
// When another match, have to check for start again.
@@ -2273,15 +2273,16 @@ win_line(
&match_conc, did_line_attr, lcs_eol_one,
&on_last_col);
ptr = line + v; // "line" may have been changed
- prev_ptr = ptr;

// Do not allow a conceal over EOL otherwise EOL will be missed
// and bad things happen.
if (*ptr == NUL)
has_match_conc = 0;
- }
#endif

+ prev_ptr = ptr;
+ }
+
#ifdef FEAT_DIFF
if (wlv.diff_hlf != (hlf_T)0)
{
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 1754fb8d1..c4d6ef6dd 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -4036,4 +4036,47 @@ func Test_normal_r_ctrl_v_cmd()
bw!
endfunc

+" Test clicking on a TAB or an unprintable character in Normal mode
+func Test_normal_click_on_ctrl_char()
+ let save_mouse = &mouse
+ set mouse=a
+ new
+
+ call setline(1, "a\<Tab>b\<C-K>c")
+ redraw
+ call test_setmouse(1, 1)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal([0, 1, 1, 0, 1], getcurpos())
+ call test_setmouse(1, 2)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal([0, 1, 2, 0, 8], getcurpos())
+ call test_setmouse(1, 3)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal([0, 1, 2, 0, 8], getcurpos())
+ call test_setmouse(1, 7)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal([0, 1, 2, 0, 8], getcurpos())
+ call test_setmouse(1, 8)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal([0, 1, 2, 0, 8], getcurpos())
+ call test_setmouse(1, 9)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal([0, 1, 3, 0, 9], getcurpos())
+ call test_setmouse(1, 10)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal([0, 1, 4, 0, 10], getcurpos())
+ call test_setmouse(1, 11)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal([0, 1, 4, 0, 10], getcurpos())
+ call test_setmouse(1, 12)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal([0, 1, 5, 0, 12], getcurpos())
+ call test_setmouse(1, 13)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal([0, 1, 5, 0, v:maxcol], getcurpos())
+
+ bwipe!
+ let &mouse = save_mouse
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 888e83951..2fee8eef1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1705,
/**/
1704,
/**/