ui: Remove redundant ui.h includes

Also move read_error_exit to os/input.c

src/nvim/buffer.c

@@ -69,7 +69,6 @@
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/window.h"
 #include "nvim/os/os.h"

src/nvim/digraph.c

@@ -23,7 +23,6 @@
 #include "nvim/normal.h"
 #include "nvim/screen.h"
 #include "nvim/strings.h"
-#include "nvim/ui.h"
 #include "nvim/os/input.h"
 
 typedef int result_T;

src/nvim/eval.c

@@ -76,7 +76,6 @@
 #include "nvim/tag.h"
 #include "nvim/tempfile.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/mouse.h"
 #include "nvim/undo.h"
 #include "nvim/version.h"

src/nvim/ex_cmds.c

@@ -62,7 +62,6 @@
 #include "nvim/tag.h"
 #include "nvim/tempfile.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/window.h"
 #include "nvim/os/os.h"

src/nvim/file_search.c

@@ -62,7 +62,6 @@
 #include "nvim/path.h"
 #include "nvim/strings.h"
 #include "nvim/tag.h"
-#include "nvim/ui.h"
 #include "nvim/window.h"
 #include "nvim/os/os.h"
 #include "nvim/os/input.h"

src/nvim/fileio.c

@@ -53,7 +53,6 @@
 #include "nvim/tempfile.h"
 #include "nvim/term.h"
 #include "nvim/types.h"
-#include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/window.h"
 #include "nvim/os/os.h"

src/nvim/getchar.c

@@ -47,7 +47,6 @@
 #include "nvim/screen.h"
 #include "nvim/strings.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/os/event.h"
 #include "nvim/os/input.h"

src/nvim/hardcopy.c

@@ -41,7 +41,6 @@
 #include "nvim/syntax.h"
 #include "nvim/term.h"
 #include "nvim/tempfile.h"
-#include "nvim/ui.h"
 #include "nvim/os/os.h"
 #include "nvim/os/input.h"
 

src/nvim/if_cscope.c

@@ -29,7 +29,6 @@
 #include "nvim/strings.h"
 #include "nvim/tag.h"
 #include "nvim/tempfile.h"
-#include "nvim/ui.h"
 #include "nvim/window.h"
 #include "nvim/os/os.h"
 #include "nvim/os/input.h"

src/nvim/mark.c

@@ -38,7 +38,6 @@
 #include "nvim/search.h"
 #include "nvim/strings.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/os/os.h"
 #include "nvim/os/input.h"
 

src/nvim/memfile.c

@@ -61,7 +61,6 @@
 #include "nvim/memory.h"
 #include "nvim/os_unix.h"
 #include "nvim/path.h"
-#include "nvim/ui.h"
 #include "nvim/os/os.h"
 #include "nvim/os/input.h"
 

src/nvim/memline.c

@@ -71,7 +71,6 @@
 #include "nvim/strings.h"
 #include "nvim/term.h"
 #include "nvim/tempfile.h"
-#include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/window.h"
 #include "nvim/os/os.h"

src/nvim/memory.c

@@ -430,7 +430,6 @@ void do_outofmem_msg(size_t size)
 #include "nvim/spell.h"
 #include "nvim/syntax.h"
 #include "nvim/tag.h"
-#include "nvim/ui.h"
 #include "nvim/window.h"
 #include "nvim/os/os.h"
 

src/nvim/message.c

@@ -42,7 +42,6 @@
 #include "nvim/screen.h"
 #include "nvim/strings.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/mouse.h"
 #include "nvim/os/os.h"
 #include "nvim/os/input.h"

src/nvim/misc2.c

@@ -50,7 +50,6 @@
 #include "nvim/syntax.h"
 #include "nvim/tag.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/window.h"
 #include "nvim/os/os.h"
 #include "nvim/os/shell.h"

src/nvim/ops.c

@@ -45,7 +45,6 @@
 #include "nvim/search.h"
 #include "nvim/strings.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/window.h"
 #include "nvim/os/input.h"

src/nvim/option.c

@@ -75,7 +75,6 @@
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/window.h"
 #include "nvim/os/os.h"

src/nvim/os/input.c

@@ -20,6 +20,8 @@
 #include "nvim/ex_cmds2.h"
 #include "nvim/getchar.h"
 #include "nvim/term.h"
+#include "nvim/main.h"
+#include "nvim/misc1.h"
 
 #define READ_BUFFER_SIZE 0xfff
 #define INPUT_BUFFER_SIZE (READ_BUFFER_SIZE * 4)
@@ -336,3 +338,11 @@ static bool input_ready(void)
          (!embedded_mode && eof);              // Stdin closed
 }
 
+// Exit because of an input read error.
+static void read_error_exit(void)
+{
+  if (silent_mode)      /* Normal way to exit for "ex -s" */
+    getout(0);
+  STRCPY(IObuff, _("Vim: Error reading input, exiting...\n"));
+  preserve_exit();
+}

src/nvim/os_unix.c

@@ -46,7 +46,6 @@
 #include "nvim/tempfile.h"
 #include "nvim/term.h"
 #include "nvim/types.h"
-#include "nvim/ui.h"
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
 #include "nvim/os/event.h"

src/nvim/quickfix.c

@@ -49,7 +49,6 @@
 #include "nvim/strings.h"
 #include "nvim/term.h"
 #include "nvim/tempfile.h"
-#include "nvim/ui.h"
 #include "nvim/window.h"
 #include "nvim/os/os.h"
 #include "nvim/os/input.h"

src/nvim/screen.c

@@ -129,7 +129,6 @@
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/version.h"
 #include "nvim/window.h"

src/nvim/spell.c

@@ -325,7 +325,6 @@
 #include "nvim/syntax.h"
 #include "nvim/term.h"
 #include "nvim/tempfile.h"
-#include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/os/os.h"
 #include "nvim/os/input.h"

src/nvim/strings.c

@@ -42,7 +42,6 @@
 #include "nvim/syntax.h"
 #include "nvim/tag.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/window.h"
 #include "nvim/os/os.h"
 #include "nvim/os/shell.h"

src/nvim/syntax.c

@@ -44,7 +44,6 @@
 #include "nvim/strings.h"
 #include "nvim/syntax_defs.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
 

src/nvim/tag.c

@@ -49,7 +49,6 @@
 #include "nvim/search.h"
 #include "nvim/strings.h"
 #include "nvim/term.h"
-#include "nvim/ui.h"
 #include "nvim/window.h"
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"

src/nvim/ui.c

@@ -93,17 +93,6 @@ int ui_get_shellsize(void)
   return retval;
 }
 
-/*
- * Exit because of an input read error.
- */
-void read_error_exit(void)
-{
-  if (silent_mode)      /* Normal way to exit for "ex -s" */
-    getout(0);
-  STRCPY(IObuff, _("Vim: Error reading input, exiting...\n"));
-  preserve_exit();
-}
-
 /*
  * May update the shape of the cursor.
  */