aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/window.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-05-22 01:02:26 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-05-25 10:07:05 +0200
commitae846b41dfed16446be6469cb01f12f1eb1fa534 (patch)
tree2851845f2faf61d5945cb4f1d8761316201a6246 /src/nvim/window.c
parenta9d7ec4587d8eb20f12ebecc427ad818fb0e4971 (diff)
downloadrneovim-ae846b41dfed16446be6469cb01f12f1eb1fa534.tar.gz
rneovim-ae846b41dfed16446be6469cb01f12f1eb1fa534.tar.bz2
rneovim-ae846b41dfed16446be6469cb01f12f1eb1fa534.zip
vim-patch:8.0.1496: VIM_CLEAR()
Problem: Clearing a pointer takes two lines. Solution: Add VIM_CLEAR() and replace vim_clear(). (Hirohito Higashi, closes #2629) vim-patch:8.0.1481
Diffstat (limited to 'src/nvim/window.c')
-rw-r--r--src/nvim/window.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 6bc082ffb2..3f555b9b2e 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -558,8 +558,7 @@ win_T *win_new_float(win_T *wp, FloatConfig fconfig, Error *err)
}
int dir;
winframe_remove(wp, &dir, NULL);
- xfree(wp->w_frame);
- wp->w_frame = NULL;
+ XFREE_CLEAR(wp->w_frame);
(void)win_comp_pos(); // recompute window positions
win_remove(wp, NULL);
win_append(lastwin_nofloating(), wp);
@@ -4297,8 +4296,7 @@ static void win_enter_ext(win_T *wp, bool undo_sync, int curwin_invalid,
do_autocmd_dirchanged((char *)globaldir, kCdScopeGlobal);
}
}
- xfree(globaldir);
- globaldir = NULL;
+ XFREE_CLEAR(globaldir);
shorten_fnames(TRUE);
}