3 files changed, 16 insertions, 4 deletions
diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c
index 5ef81721d4..0049ae6b95 100644
--- a/src/nvim/msgpack_rpc/helpers.c
+++ b/src/nvim/msgpack_rpc/helpers.c
@@ -419,8 +419,8 @@ void msgpack_rpc_validate(uint64_t *response_id,
     return;
   }
 
-  if ((type == kMessageTypeRequest && req->via.array.size != 4) ||
-      (type == kMessageTypeNotification && req->via.array.size != 3)) {
+  if ((type == kMessageTypeRequest && req->via.array.size != 4)
+      || (type == kMessageTypeNotification && req->via.array.size != 3)) {
     api_set_error(err, Validation, _("Request array size should be 4 (request) "
                                      "or 3 (notification)"));
     return;
diff --git a/src/nvim/msgpack_rpc/remote_ui.c b/src/nvim/msgpack_rpc/remote_ui.c
index f0d92b52a0..6ffcffe2e1 100644
--- a/src/nvim/msgpack_rpc/remote_ui.c
+++ b/src/nvim/msgpack_rpc/remote_ui.c
@@ -96,6 +96,7 @@ static Object remote_ui_attach(uint64_t channel_id, uint64_t request_id,
   ui->visual_bell = remote_ui_visual_bell;
   ui->update_fg = remote_ui_update_fg;
   ui->update_bg = remote_ui_update_bg;
+  ui->update_sp = remote_ui_update_sp;
   ui->flush = remote_ui_flush;
   ui->suspend = remote_ui_suspend;
   ui->set_title = remote_ui_set_title;
@@ -285,6 +286,10 @@ static void remote_ui_highlight_set(UI *ui, HlAttrs attrs)
     PUT(hl, "background", INTEGER_OBJ(attrs.background));
   }
 
+  if (attrs.special != -1) {
+    PUT(hl, "special", INTEGER_OBJ(attrs.special));
+  }
+
   ADD(args, DICTIONARY_OBJ(hl));
   push_call(ui, "highlight_set", args);
 }
@@ -323,6 +328,13 @@ static void remote_ui_update_bg(UI *ui, int bg)
   push_call(ui, "update_bg", args);
 }
 
+static void remote_ui_update_sp(UI *ui, int sp)
+{
+  Array args = ARRAY_DICT_INIT;
+  ADD(args, INTEGER_OBJ(sp));
+  push_call(ui, "update_sp", args);
+}
+
 static void remote_ui_flush(UI *ui)
 {
   UIData *data = ui->data;
diff --git a/src/nvim/msgpack_rpc/server.c b/src/nvim/msgpack_rpc/server.c
index 474e25ffeb..6cc56ba3dd 100644
--- a/src/nvim/msgpack_rpc/server.c
+++ b/src/nvim/msgpack_rpc/server.c
@@ -14,7 +14,7 @@
 #include "nvim/vim.h"
 #include "nvim/memory.h"
 #include "nvim/log.h"
-#include "nvim/tempfile.h"
+#include "nvim/fileio.h"
 #include "nvim/path.h"
 #include "nvim/strings.h"
 
@@ -59,7 +59,7 @@ static void set_vservername(garray_T *srvs)
   char *default_server = (srvs->ga_len > 0)
     ? ((SocketWatcher **)srvs->ga_data)[0]->addr
     : NULL;
-  set_vim_var_string(VV_SEND_SERVER, (char_u *)default_server, -1);
+  set_vim_var_string(VV_SEND_SERVER, default_server, -1);
 }
 
 /// Teardown the server module