1 files changed, 28 insertions, 4 deletions
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index d32969f149..ae38754c1e 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -30,7 +30,11 @@
 #include "nvim/screen.h"
 #include "nvim/syntax.h"
 #include "nvim/window.h"
-#include "nvim/tui/tui.h"
+#ifdef FEAT_TUI
+# include "nvim/tui/tui.h"
+#else
+# include "nvim/msgpack_rpc/server.h"
+#endif
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ui.c.generated.h"
@@ -83,7 +87,22 @@ static int height, width;
 
 void ui_builtin_start(void)
 {
+#ifdef FEAT_TUI
   tui_start();
+#else
+  fprintf(stderr, "Neovim was built without a Terminal UI," \
+          "press Ctrl+C to exit\n");
+
+  size_t len;
+  char **addrs = server_address_list(&len);
+  if (addrs != NULL) {
+    fprintf(stderr, "currently listening on the following address(es)\n");
+    for (size_t i = 0; i < len; i++) {
+      fprintf(stderr, "\t%s\n", addrs[i]);
+    }
+    xfree(addrs);
+  }
+#endif
 }
 
 void ui_builtin_stop(void)
@@ -155,6 +174,7 @@ void ui_resize(int new_width, int new_height)
 
   UI_CALL(update_fg, (ui->rgb ? normal_fg : cterm_normal_fg_color - 1));
   UI_CALL(update_bg, (ui->rgb ? normal_bg : cterm_normal_bg_color - 1));
+  UI_CALL(update_sp, (ui->rgb ? normal_sp : -1));
 
   sr.top = 0;
   sr.bot = height - 1;
@@ -187,7 +207,7 @@ void ui_mouse_off(void)
   UI_CALL(mouse_off);
 }
 
-void ui_attach(UI *ui)
+void ui_attach_impl(UI *ui)
 {
   if (ui_count == MAX_UI_COUNT) {
     abort();
@@ -197,7 +217,7 @@ void ui_attach(UI *ui)
   ui_refresh();
 }
 
-void ui_detach(UI *ui)
+void ui_detach_impl(UI *ui)
 {
   size_t shift_index = MAX_UI_COUNT;
 
@@ -388,7 +408,7 @@ static void parse_control_character(uint8_t c)
 
 static void set_highlight_args(int attr_code)
 {
-  HlAttrs rgb_attrs = { false, false, false, false, false, -1, -1 };
+  HlAttrs rgb_attrs = { false, false, false, false, false, -1, -1, -1 };
   HlAttrs cterm_attrs = rgb_attrs;
 
   if (attr_code == HL_NORMAL) {
@@ -425,6 +445,10 @@ static void set_highlight_args(int attr_code)
     rgb_attrs.background = aep->rgb_bg_color;
   }
 
+  if (aep->rgb_sp_color != normal_sp) {
+    rgb_attrs.special = aep->rgb_sp_color;
+  }
+
   if (cterm_normal_fg_color != aep->cterm_fg_color) {
     cterm_attrs.foreground = aep->cterm_fg_color - 1;
   }