aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1670: sign column not always properly aligned

Browse Source 
Problem:    Sign column not always properly aligned.
Solution:   Use "col" only after it was calculated. (Yee Cheng Chin,
            closes #4649)
This commit is contained in:
Bram Moolenaar 2019-07-12 19:22:22 +02:00
parent efef9fea72
commit 0231f8312b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui.c
View File

@ -2253,7 +2253,7 @@ gui_outstr_nowrap(
int col = gui.col; int col = gui.col;
#ifdef FEAT_SIGN_ICONS #ifdef FEAT_SIGN_ICONS
int draw_sign = FALSE; int draw_sign = FALSE;
int signcol = col; int signcol;
char_u extra[18]; char_u extra[18];
# ifdef FEAT_NETBEANS_INTG # ifdef FEAT_NETBEANS_INTG
int multi_sign = FALSE; int multi_sign = FALSE;
@ -2270,7 +2270,7 @@ gui_outstr_nowrap(
# ifdef FEAT_NETBEANS_INTG # ifdef FEAT_NETBEANS_INTG
|| *s == MULTISIGN_BYTE || *s == MULTISIGN_BYTE
# endif # endif
) )
{ {
# ifdef FEAT_NETBEANS_INTG # ifdef FEAT_NETBEANS_INTG
if (*s == MULTISIGN_BYTE) if (*s == MULTISIGN_BYTE)
@ -2289,7 +2289,10 @@ gui_outstr_nowrap(
--col; --col;
len = (int)STRLEN(s); len = (int)STRLEN(s);
if (len > 2) 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; draw_sign = TRUE;
highlight_mask = 0; highlight_mask = 0;
} }

2
src/version.c
View File

@ -777,6 +777,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1670,
/**/ /**/
1669, 1669,
/**/ /**/