Merge #8904 from janlazo/vim-8.0.0900

3 files changed, 5 insertions, 2 deletions

diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index c384d253b9..ab24b63110 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -2728,6 +2728,7 @@ void ex_packadd(exarg_T *eap)
 /// ":options"
 void ex_options(exarg_T *eap)
 {
+  vim_setenv("OPTWIN_CMD", cmdmod.tab ? "tab" : "");
   cmd_source((char_u *)SYS_OPTWIN_FILE, NULL);
 }
 
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. */
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 092820321c..c3996046e0 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -149,7 +149,7 @@ void redraw_later(int type)
 
 void redraw_win_later(win_T *wp, int type)
 {
-  if (wp->w_redr_type < type) {
+  if (!exiting && wp->w_redr_type < type) {
     wp->w_redr_type = type;
     if (type >= NOT_VALID)
       wp->w_lines_valid = 0;