aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/memory.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-08-26 15:17:54 +0200
committerGitHub <noreply@github.com>2018-08-26 15:17:54 +0200
commit8f058dca890ca9b9678e2435020f84a5f9c75acb (patch)
tree1e52a92192a46d3f660ce02b7891b365f2da0d7f /src/nvim/memory.c
parent7898de5211fc396dc5a001a22f9c7db5311c317e (diff)
parente85bed083022c88bd8c42d91f8432eb5dd4ff141 (diff)
downloadrneovim-8f058dca890ca9b9678e2435020f84a5f9c75acb.tar.gz
rneovim-8f058dca890ca9b9678e2435020f84a5f9c75acb.tar.bz2
rneovim-8f058dca890ca9b9678e2435020f84a5f9c75acb.zip
Merge #8904 from janlazo/vim-8.0.0900
Diffstat (limited to 'src/nvim/memory.c')
-rw-r--r--src/nvim/memory.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index d3d0968a5c..8789075c44 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -619,7 +619,6 @@ void free_all_mem(void)
/* Obviously named calls. */
free_all_autocmds();
- free_all_options();
free_all_marks();
alist_clear(&global_alist);
free_homedir();
@@ -657,6 +656,9 @@ void free_all_mem(void)
/* Destroy all windows. Must come before freeing buffers. */
win_free_all();
+ // Free all option values. Must come after closing windows.
+ free_all_options();
+
free_cmdline_buf();
/* Clear registers. */