6 files changed, 85 insertions, 16 deletions
diff --git a/src/nvim/auevents.lua b/src/nvim/auevents.lua
index 3d8a75febd..7624dd2303 100644
--- a/src/nvim/auevents.lua
+++ b/src/nvim/auevents.lua
@@ -77,8 +77,9 @@ return {
     'TabNew',                 -- when creating a new tab
     'TabNewEntered',          -- after entering a new tab
     'TermChanged',            -- after changing 'term'
-    'TermResponse',           -- after setting "v:termresponse"
+    'TermClose',              -- after the processs exits
     'TermOpen',               -- after opening a terminal buffer
+    'TermResponse',           -- after setting "v:termresponse"
     'TextChanged',            -- text was modified
     'TextChangedI',           -- text was modified in Insert mode
     'User',                   -- user defined autocommand
@@ -98,9 +99,10 @@ return {
   -- List of neovim-specific events or aliases for the purpose of generating 
   -- syntax file
   neovim_specific = {
+    TabClosed=true,
     TabNew=true,
     TabNewEntered=true,
-    TabClosed=true,
-    TermEnter=true,
+    TermClose=true,
+    TermOpen=true,
   },
 }
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index e1fa76c526..9581b81456 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -21781,8 +21781,10 @@ static void on_process_exit(Process *proc, int status, void *d)
   TerminalJobData *data = d;
   if (data->term && !data->exited) {
     data->exited = true;
-    terminal_close(data->term,
-        _("\r\n[Program exited, press any key to close]"));
+    char msg[22];
+    snprintf(msg, sizeof msg, "\r\n[Process exited %d]", proc->status);
+    terminal_close(data->term, msg);
+    apply_autocmds(EVENT_TERMCLOSE, NULL, NULL, false, curbuf);
   }
 
   if (data->status_ptr) {
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index d25dc7c941..6d386f3599 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -42,8 +42,6 @@ void try_to_free_memory(void)
   clear_sb_text();
   // Try to save all buffers and release as many blocks as possible
   mf_release_all();
-  // cleanup recursive lists/dicts
-  garbage_collect();
 
   trying_to_free = false;
 }
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index fce3558e9f..d6bc416c91 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -7701,6 +7701,16 @@ static void nv_open(cmdarg_T *cap)
 // Handle an arbitrary event in normal mode
 static void nv_event(cmdarg_T *cap)
 {
+  // Garbage collection should have been executed before blocking for events in
+  // the `os_inchar` in `state_enter`, but we also disable it here in case the
+  // `os_inchar` branch was not executed(!queue_empty(loop.events), which could
+  // have `may_garbage_collect` set to true in `normal_check`).
+  //
+  // That is because here we may run code that calls `os_inchar`
+  // later(`f_confirm` or `get_keystroke` for example), but in these cases it is
+  // not safe to perform garbage collection because there could be unreferenced
+  // lists or dicts being used.
+  may_garbage_collect = false;
   queue_process_events(loop.events);
   cap->retval |= CA_COMMAND_BUSY;       // don't call edit() now
 }
diff --git a/src/nvim/terminal.h b/src/nvim/terminal.h
index 6e0b062fbd..25e609fb68 100644
--- a/src/nvim/terminal.h
+++ b/src/nvim/terminal.h
@@ -18,15 +18,6 @@ typedef struct {
   terminal_close_cb close_cb;
 } TerminalOptions;
 
-#define TERMINAL_OPTIONS_INIT ((TerminalOptions) {           \
-    .data = NULL,                                            \
-    .width = 80,                                             \
-    .height = 24,                                            \
-    .write_cb = NULL,                                        \
-    .resize_cb = NULL,                                       \
-    .close_cb = NULL                                         \
-    })
-
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "terminal.h.generated.h"
 #endif
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 45b36e7d99..f5e43878e4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -74,6 +74,72 @@ static char *features[] = {
 
 // clang-format off
 static int included_patches[] = {
+  916,
+  // 915,
+  // 914,
+  // 913,
+  // 912,
+  // 911,
+  // 910,
+  // 909,
+  // 908,
+  // 907,
+  // 906,
+  // 905,
+  // 904,
+  // 903,
+  // 902,
+  // 901,
+  // 900,
+  // 899,
+  // 898,
+  // 897,
+  // 896,
+  // 895,
+  // 894,
+  // 893,
+  // 892,
+  // 891,
+  // 890,
+  // 889,
+  // 888,
+  // 887,
+  // 886,
+  // 885,
+  // 884,
+  // 883,
+  // 882,
+  // 881,
+  // 880,
+  // 879,
+  // 878,
+  // 877,
+  // 876,
+  // 875,
+  // 874,
+  // 873,
+  // 872,
+  // 871,
+  // 870,
+  // 869,
+  // 868,
+  // 867,
+  // 866,
+  // 865,
+  // 864,
+  // 863,
+  // 862,
+  // 861,
+  // 860,
+  // 859,
+  // 858,
+  // 857,
+  // 856,
+  // 855,
+  // 854,
+  // 853,
+  // 852,
+  // 851,
   // 850,
      849,
   // 848,