patch 8.2.4555: getmousepos() returns the wrong columnv8.2.4555

Problem:    getmousepos() returns the wrong column. (Ernie Rael)
Solution:   Limit to the text size, not the number of bytes.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/mouse.c b/src/mouse.c
index 6a32cac9d0..a094df6bbb 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -3099,17 +3099,14 @@ f_getmousepos(typval_T *argvars UNUSED, typval_T *rettv)
 	    col -= left_off;
 	    if (row >= 0 && row < wp->w_height && col >= 0 && col < wp->w_width)
 	    {
-		char_u	*p;
 		int	count;
 
 		mouse_comp_pos(wp, &row, &col, &line, NULL);
 
-		// limit to text length plus one
-		p = ml_get_buf(wp->w_buffer, line, FALSE);
-		count = (int)STRLEN(p);
+		// limit to text size plus one
+		count = linetabsize(ml_get_buf(wp->w_buffer, line, FALSE));
 		if (col > count)
 		    col = count;
-
 		column = col + 1;
 	    }
 	}