aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/window.c
diff options
context:
space:
mode:
authorAshkan Kiani <ashkan.k.kiani@gmail.com>2019-11-23 14:28:54 -0800
committerAshkan Kiani <ashkan.k.kiani@gmail.com>2019-11-23 14:28:54 -0800
commit42c53d266afb989467879de29ef2e9ccdaa4b152 (patch)
tree5e7233a958aa6964e74911d35904c28d3a2582b7 /src/nvim/window.c
parent73487f4130581da72c9e838189aab39c79c177c5 (diff)
parent61d2a12743bcefbdd661b446b0b0fea7a1f77b17 (diff)
downloadrneovim-42c53d266afb989467879de29ef2e9ccdaa4b152.tar.gz
rneovim-42c53d266afb989467879de29ef2e9ccdaa4b152.tar.bz2
rneovim-42c53d266afb989467879de29ef2e9ccdaa4b152.zip
Merge remote-tracking branch 'origin/master' into lsp-followup
Diffstat (limited to 'src/nvim/window.c')
-rw-r--r--src/nvim/window.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 2a7578e33c..dee36df433 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -633,6 +633,12 @@ void win_set_minimal_style(win_T *wp)
xfree(wp->w_p_scl);
wp->w_p_scl = (char_u *)xstrdup("auto");
}
+
+ // colorcolumn: cleared
+ if (wp->w_p_cc != NULL && *wp->w_p_cc != NUL) {
+ xfree(wp->w_p_cc);
+ wp->w_p_cc = (char_u *)xstrdup("");
+ }
}
void win_config_float(win_T *wp, FloatConfig fconfig)