From 899f20deae22d8cfc89d88d5f1869e5191d4b360 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 7 Jul 2019 14:56:25 +0200 Subject: patch 8.1.1643: sign placement is wrong when 'foldcolumn' is set Problem: Sign placement is wrong when 'foldcolumn' is set. Solution: Adjust the column computation. (Yee Cheng Chin, closes #4627) --- src/gui.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui.c b/src/gui.c index 634f3fbc5..7c378c6fe 100644 --- a/src/gui.c +++ b/src/gui.c @@ -2253,7 +2253,7 @@ gui_outstr_nowrap( int col = gui.col; #ifdef FEAT_SIGN_ICONS int draw_sign = FALSE; - int signcol = 0; + int signcol = col; char_u extra[18]; # ifdef FEAT_NETBEANS_INTG int multi_sign = FALSE; @@ -2289,7 +2289,7 @@ gui_outstr_nowrap( --col; len = (int)STRLEN(s); if (len > 2) - signcol = len - 3; // Right align sign icon in the number column + signcol = col + len - 3; // Right align sign icon in the number column draw_sign = TRUE; highlight_mask = 0; } diff --git a/src/version.c b/src/version.c index f71c75c76..c7e2a1633 100644 --- a/src/version.c +++ b/src/version.c @@ -777,6 +777,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1643, /**/ 1642, /**/ -- cgit v1.2.1