From 592a8f1e90d5abaa695280bf6d41a547b3631d0d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 1 Sep 2023 06:45:27 +0800
Subject: vim-patch:9.0.1828: cursor wrong with virt text before double-width
 char (#24967)

Problem:  Wrong cursor position with virtual text before double-width
          char at window edge.
Solution: Check for double-width char before adding virtual text size.

closes: vim/vim#12977

https://github.com/vim/vim/commit/ac2d8815ae7a93c54b07cba76475cfb3f26a3ac6
---
 src/nvim/plines.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/plines.c b/src/nvim/plines.c
index f59a1754f5..82554c7785 100644
--- a/src/nvim/plines.c
+++ b/src/nvim/plines.c
@@ -216,6 +216,7 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp)
   if (*s == NUL && !has_lcs_eol) {
     size = 0;  // NUL is not displayed
   }
+  bool is_doublewidth = size == 2 && MB_BYTE2LEN((uint8_t)(*s)) > 1;
 
   if (cts->cts_has_virt_text) {
     int tab_size = size;
@@ -247,8 +248,7 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp)
     }
   }
 
-  if (size == 2 && MB_BYTE2LEN((uint8_t)(*s)) > 1
-      && wp->w_p_wrap && in_win_border(wp, vcol)) {
+  if (is_doublewidth && wp->w_p_wrap && in_win_border(wp, vcol + size - 2)) {
     // Count the ">" in the last column.
     size++;
     mb_added = 1;
-- 
cgit