summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-07-07 14:56:25 +0200
committerBram Moolenaar <Bram@vim.org>2019-07-07 14:56:25 +0200
commit899f20deae22d8cfc89d88d5f1869e5191d4b360 (patch)
treeb71c28108dc7c64b7d52099df159840a1c3f0fe0
parentec572ad6a6cb0d4e71901951a70a4f038d48cb17 (diff)
downloadvim-git-8.1.1643.tar.gz
patch 8.1.1643: sign placement is wrong when 'foldcolumn' is setv8.1.1643
Problem: Sign placement is wrong when 'foldcolumn' is set. Solution: Adjust the column computation. (Yee Cheng Chin, closes #4627)
-rw-r--r--src/gui.c4
-rw-r--r--src/version.c2
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
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1643,
+/**/
1642,
/**/
1641,