# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1562504405 -7200
# Node ID 9ca8baed6b9097fcc05718de0cfcab6208ccc3ee
# Parent  1709eeb719e25320a343845efd7f845b8137c5fa
patch 8.1.1643: sign placement is wrong when 'foldcolumn' is set

commit https://github.com/vim/vim/commit/899f20deae22d8cfc89d88d5f1869e5191d4b360
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Jul 7 14:56:25 2019 +0200

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

    Problem:    Sign placement is wrong when 'foldcolumn' is set.
    Solution:   Adjust the column computation. (Yee Cheng Chin, closes https://github.com/vim/vim/issues/4627)

diff --git a/src/gui.c b/src/gui.c
--- 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
--- 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,