From 49ede0a68f1f8fd46dc9715fb1f332a13d13dbe3 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 5 Jun 2023 06:33:43 +0800
Subject: vim-patch:9.0.1600: screenpos() does not take w_skipcol into account

Problem:    screenpos() does not take w_skipcol into account.
Solution:   Subtract w_skipcol from column. (closes vim/vim#12486, closes vim/vim#12476)

https://github.com/vim/vim/commit/f0e68c0e2a3539f899e737e5b167622fe081fbbd
---
 src/nvim/move.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/nvim/move.c b/src/nvim/move.c
index 48691db26d..57466120e9 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -1098,6 +1098,10 @@ void textpos2screenpos(win_T *wp, pos_T *pos, int *rowp, int *scolp, int *ccolp,
       col += off;
       int width = wp->w_width_inner - off + win_col_off2(wp);
 
+      if (pos->lnum == wp->w_topline) {
+        col -= wp->w_skipcol;
+      }
+
       // long line wrapping, adjust row
       if (wp->w_p_wrap && col >= (colnr_T)wp->w_width_inner && width > 0) {
         // use same formula as what is used in curs_columns()
-- 
cgit