vim-patch:7.4.2201

Problem:    The sign column disappears when the last sign is deleted.
Solution:   Add the 'signcolumn' option. (Christian Brabandt)

https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51

1 files changed, 4 insertions, 13 deletions

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 50517d2829..72549f1f21 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -576,15 +576,6 @@ void update_debug_sign(buf_T *buf, linenr_T lnum)
 }
 
 /*
- * Return TRUE when window "wp" has a column to draw signs in.
- */
-static int draw_signcolumn(win_T *wp)
-{
-    return (wp->w_buffer->b_signlist != NULL);
-}
-
-
-/*
  * Update a single window.
  *
  * This may cause the windows below it also to be redrawn (when clearing the
@@ -1598,7 +1589,7 @@ static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T h
                   ' ', ' ', hl_attr(HLF_FC));
     }
 
-    if (draw_signcolumn(wp)) {
+    if (signcolumn_on(wp)) {
         int nn = n + 2;
 
         /* draw the sign column left of the fold column */
@@ -1639,7 +1630,7 @@ static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T h
       n = nn;
     }
 
-    if (draw_signcolumn(wp))
+    if (signcolumn_on(wp))
     {
         int nn = n + 2;
 
@@ -1753,7 +1744,7 @@ static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T
   RL_MEMSET(col, hl_attr(HLF_FL), wp->w_width - col);
 
   /* If signs are being displayed, add two spaces. */
-  if (draw_signcolumn(wp)) {
+  if (signcolumn_on(wp)) {
       len = wp->w_width - col;
       if (len > 0) {
           if (len > 2) {
@@ -2701,7 +2692,7 @@ win_line (
           draw_state = WL_SIGN;
           /* Show the sign column when there are any signs in this
            * buffer or when using Netbeans. */
-          if (draw_signcolumn(wp)) {
+          if (signcolumn_on(wp)) {
               int text_sign;
               /* Draw two cells with the sign value or blank. */
               c_extra = ' ';