1 files changed, 33 insertions, 10 deletions

diff --git a/src/nvim/buffer_updates.c b/src/nvim/buffer_updates.c
index 68e123896b..5c573530d1 100644
--- a/src/nvim/buffer_updates.c
+++ b/src/nvim/buffer_updates.c
@@ -135,7 +135,7 @@ void buf_updates_unregister(buf_T *buf, uint64_t channelid)
   }
 }
 
-void buf_updates_unregister_all(buf_T *buf)
+void buf_updates_unload(buf_T *buf, bool can_reload)
 {
   size_t size = kv_size(buf->update_channels);
   if (size) {
@@ -146,9 +146,20 @@ void buf_updates_unregister_all(buf_T *buf)
     kv_init(buf->update_channels);
   }
 
+  size_t j = 0;
   for (size_t i = 0; i < kv_size(buf->update_callbacks); i++) {
     BufUpdateCallbacks cb = kv_A(buf->update_callbacks, i);
-    if (cb.on_detach != LUA_NOREF) {
+    LuaRef thecb = LUA_NOREF;
+
+    bool keep = false;
+    if (can_reload && cb.on_reload != LUA_NOREF) {
+      keep = true;
+      thecb = cb.on_reload;
+    } else if (cb.on_detach != LUA_NOREF) {
+      thecb = cb.on_detach;
+    }
+
+    if (thecb != LUA_NOREF) {
       Array args = ARRAY_DICT_INIT;
       Object items[1];
       args.size = 1;
@@ -158,15 +169,24 @@ void buf_updates_unregister_all(buf_T *buf)
       args.items[0] = BUFFER_OBJ(buf->handle);
 
       textlock++;
-      nlua_call_ref(cb.on_detach, "detach", args, false, NULL);
+      nlua_call_ref(thecb, keep ? "reload" : "detach", args, false, NULL);
       textlock--;
     }
-    free_update_callbacks(cb);
+
+    if (keep) {
+      kv_A(buf->update_callbacks, j++) = kv_A(buf->update_callbacks, i);
+    } else {
+      buffer_update_callbacks_free(cb);
+    }
+  }
+  kv_size(buf->update_callbacks) = j;
+  if (kv_size(buf->update_callbacks) == 0) {
+    kv_destroy(buf->update_callbacks);
+    kv_init(buf->update_callbacks);
   }
-  kv_destroy(buf->update_callbacks);
-  kv_init(buf->update_callbacks);
 }
 
+
 void buf_updates_send_changes(buf_T *buf,
                               linenr_T firstline,
                               int64_t num_added,
@@ -270,7 +290,7 @@ void buf_updates_send_changes(buf_T *buf,
       textlock--;
 
       if (res.type == kObjectTypeBoolean && res.data.boolean == true) {
-        free_update_callbacks(cb);
+        buffer_update_callbacks_free(cb);
         keep = false;
       }
       api_free_object(res);
@@ -322,7 +342,7 @@ void buf_updates_send_splice(
       textlock--;
 
       if (res.type == kObjectTypeBoolean && res.data.boolean == true) {
-        free_update_callbacks(cb);
+        buffer_update_callbacks_free(cb);
         keep = false;
       }
     }
@@ -358,7 +378,7 @@ void buf_updates_changedtick(buf_T *buf)
       textlock--;
 
       if (res.type == kObjectTypeBoolean && res.data.boolean == true) {
-        free_update_callbacks(cb);
+        buffer_update_callbacks_free(cb);
         keep = false;
       }
       api_free_object(res);
@@ -386,8 +406,11 @@ void buf_updates_changedtick_single(buf_T *buf, uint64_t channel_id)
     rpc_send_event(channel_id, "nvim_buf_changedtick_event", args);
 }
 
-static void free_update_callbacks(BufUpdateCallbacks cb)
+void buffer_update_callbacks_free(BufUpdateCallbacks cb)
 {
   api_free_luaref(cb.on_lines);
+  api_free_luaref(cb.on_bytes);
   api_free_luaref(cb.on_changedtick);
+  api_free_luaref(cb.on_reload);
+  api_free_luaref(cb.on_detach);
 }