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)
diff --git a/src/gui.c b/src/gui.c
index 5dcab51..e66581f 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -2253,7 +2253,7 @@
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 @@
# ifdef FEAT_NETBEANS_INTG
|| *s == MULTISIGN_BYTE
# endif
- )
+ )
{
# ifdef FEAT_NETBEANS_INTG
if (*s == MULTISIGN_BYTE)
@@ -2289,7 +2289,10 @@
--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 ec0f7a0..b5504b1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1670,
+/**/
1669,
/**/
1668,