aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/buffer.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-03-29 20:25:09 -0400
committerGitHub <noreply@github.com>2021-03-29 20:25:09 -0400
commit3c497e214f48ee1433d759f5a56c028df5186f24 (patch)
tree8256f108b6f411df484062617d733e8f1217b4af /src/nvim/buffer.c
parentaa6adacd77e59b2cf2ca7bdeae9a24c062b2a9c0 (diff)
parentaf2f0ffdf4261bf1167f044ca771fa225f2ae977 (diff)
downloadrneovim-3c497e214f48ee1433d759f5a56c028df5186f24.tar.gz
rneovim-3c497e214f48ee1433d759f5a56c028df5186f24.tar.bz2
rneovim-3c497e214f48ee1433d759f5a56c028df5186f24.zip
Merge pull request #14238 from janlazo/vim-8.1.0958
vim-patch:8.1.{874,958,989,2380},8.2.{1621,2674}
Diffstat (limited to 'src/nvim/buffer.c')
-rw-r--r--src/nvim/buffer.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index cc9f130bfc..c7ec3a456c 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -1947,13 +1947,9 @@ void free_buf_options(buf_T *buf, int free_p_ff)
clear_string_option(&buf->b_p_flp);
clear_string_option(&buf->b_p_isk);
clear_string_option(&buf->b_p_vsts);
- if (buf->b_p_vsts_nopaste) {
- xfree(buf->b_p_vsts_nopaste);
- }
+ xfree(buf->b_p_vsts_nopaste);
buf->b_p_vsts_nopaste = NULL;
- if (buf->b_p_vsts_array) {
- xfree(buf->b_p_vsts_array);
- }
+ xfree(buf->b_p_vsts_array);
buf->b_p_vsts_array = NULL;
clear_string_option(&buf->b_p_vts);
XFREE_CLEAR(buf->b_p_vts_array);