From 0231f8312b11a259d9cb550f3318895f6b4d76be Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 12 Jul 2019 19:22:22 +0200 Subject: patch 8.1.1670: sign column not always properly aligned Problem: Sign column not always properly aligned. Solution: Use "col" only after it was calculated. (Yee Cheng Chin, closes #4649) --- src/gui.c | 9 ++++++--- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gui.c b/src/gui.c index 5dcab515a..e66581f52 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 = col; + int signcol; char_u extra[18]; # ifdef FEAT_NETBEANS_INTG int multi_sign = FALSE; @@ -2270,7 +2270,7 @@ gui_outstr_nowrap( # ifdef FEAT_NETBEANS_INTG || *s == MULTISIGN_BYTE # endif - ) + ) { # ifdef FEAT_NETBEANS_INTG if (*s == MULTISIGN_BYTE) @@ -2289,7 +2289,10 @@ gui_outstr_nowrap( --col; len = (int)STRLEN(s); if (len > 2) - signcol = col + len - 3; // Right align sign icon in the number column + // right align sign icon in the number column + signcol = col + len - 3; + else + signcol = col; draw_sign = TRUE; highlight_mask = 0; } diff --git a/src/version.c b/src/version.c index ec0f7a029..b5504b187 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 */ +/**/ + 1670, /**/ 1669, /**/ -- cgit v1.2.1