From f2ed7605da45eb79a4f7bb89fb19f680fb5a4927 Mon Sep 17 00:00:00 2001
From: Dan Aloni <alonid@gmail.com>
Date: Fri, 15 May 2020 19:22:44 +0300
Subject: Handle 'orphaned signs' on line deletion for signcolumn >= 2

---
 src/nvim/option.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/nvim/option.c')

diff --git a/src/nvim/option.c b/src/nvim/option.c
index 914b92618c..666c526a18 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -7582,10 +7582,20 @@ int csh_like_shell(void)
 /// Return the number of requested sign columns, based on current
 /// buffer signs and on user configuration.
 int win_signcol_count(win_T *wp)
+{
+  return win_signcol_configured(wp, NULL);
+}
+
+/// Return the number of requested sign columns, based on user / configuration.
+int win_signcol_configured(win_T *wp, int *is_fixed)
 {
   int minimum = 0, maximum = 1, needed_signcols;
   const char *scl = (const char *)wp->w_p_scl;
 
+  if (is_fixed) {
+    *is_fixed = 1;
+  }
+
   // Note: It checks "no" or "number" in 'signcolumn' option
   if (*scl == 'n'
       && (*(scl + 1) == 'o' || (*(scl + 1) == 'u'
@@ -7603,7 +7613,11 @@ int win_signcol_count(win_T *wp)
     return 1;
   }
 
-  // auto or auto:<NUM>
+  if (is_fixed) {
+    // auto or auto:<NUM>
+    *is_fixed = 0;
+  }
+
   if (!strncmp(scl, "auto:", 5)) {
     // Variable depending on a configuration
     maximum = scl[5] - '0';
-- 
cgit