aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.1.1643: sign placement is wrong when 'foldcolumn' is set

Browse Source 
Problem:    Sign placement is wrong when 'foldcolumn' is set.
Solution:   Adjust the column computation. (Yee Cheng Chin, closes #4627)
This commit is contained in:
Bram Moolenaar
2019-07-07 14:56:25 +02:00
parent ec572ad6a6
commit 899f20deae
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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 = 0; int signcol = col;
char_u extra[18]; char_u extra[18];
# ifdef FEAT_NETBEANS_INTG # ifdef FEAT_NETBEANS_INTG
int multi_sign = FALSE; int multi_sign = FALSE;
@@ -2289,7 +2289,7 @@ gui_outstr_nowrap(
--col; --col;
len = (int)STRLEN(s); len = (int)STRLEN(s);
if (len > 2) 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; 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 */
/**/
1643,
/**/ /**/
1642, 1642,
/**/ /**/