aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/buffer.c1
-rw-r--r--src/nvim/digraph.c1
-rw-r--r--src/nvim/eval.c1
-rw-r--r--src/nvim/ex_cmds.c1
-rw-r--r--src/nvim/file_search.c1
-rw-r--r--src/nvim/fileio.c1
-rw-r--r--src/nvim/getchar.c1
-rw-r--r--src/nvim/hardcopy.c1
-rw-r--r--src/nvim/if_cscope.c1
-rw-r--r--src/nvim/mark.c1
-rw-r--r--src/nvim/memfile.c1
-rw-r--r--src/nvim/memline.c1
-rw-r--r--src/nvim/memory.c1
-rw-r--r--src/nvim/message.c1
-rw-r--r--src/nvim/misc2.c1
-rw-r--r--src/nvim/ops.c1
-rw-r--r--src/nvim/option.c1
-rw-r--r--src/nvim/os/input.c10
-rw-r--r--src/nvim/os_unix.c1
-rw-r--r--src/nvim/quickfix.c1
-rw-r--r--src/nvim/screen.c1
-rw-r--r--src/nvim/spell.c1
-rw-r--r--src/nvim/strings.c1
-rw-r--r--src/nvim/syntax.c1
-rw-r--r--src/nvim/tag.c1
-rw-r--r--src/nvim/ui.c11
26 files changed, 10 insertions, 35 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 7bf8ff2c5c..ec10a826c7 100644
--- a/src/nvim/buffer.c
+++ b/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"
diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index eb3b35bfb9..440d07aab0 100644
--- a/src/nvim/digraph.c
+++ b/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;
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index ba584d0504..34990a62e0 100644
--- a/src/nvim/eval.c
+++ b/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"
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 68bee9ed17..556e0c01e3 100644
--- a/src/nvim/ex_cmds.c
+++ b/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"
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c
index 8ccdf33980..1cb9e1e8f7 100644
--- a/src/nvim/file_search.c
+++ b/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"
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index f2c3afe9a6..3be9d89d87 100644
--- a/src/nvim/fileio.c
+++ b/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"
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 63ae5b4d4f..6c70773fcf 100644
--- a/src/nvim/getchar.c
+++ b/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"
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c
index 58fee17ed1..5d9d353fc8 100644
--- a/src/nvim/hardcopy.c
+++ b/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"
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index dc7486f332..bb41db6168 100644
--- a/src/nvim/if_cscope.c
+++ b/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"
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index 9971460537..4ded438f52 100644
--- a/src/nvim/mark.c
+++ b/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"
diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c
index 9bad7a4cf4..d8d59474a2 100644
--- a/src/nvim/memfile.c
+++ b/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"
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 469601d37a..f6246c8b57 100644
--- a/src/nvim/memline.c
+++ b/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"
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index f305c4628f..4c5a45b8b6 100644
--- a/src/nvim/memory.c
+++ b/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"
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 0c64b694a5..cd0c548fb4 100644
--- a/src/nvim/message.c
+++ b/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"
diff --git a/src/nvim/misc2.c b/src/nvim/misc2.c
index 3fe5f1a0ed..acf243b349 100644
--- a/src/nvim/misc2.c
+++ b/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"
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index edec3518cb..6bf3f6036f 100644
--- a/src/nvim/ops.c
+++ b/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"
diff --git a/src/nvim/option.c b/src/nvim/option.c
index bdb9e14e7c..1d3281e952 100644
--- a/src/nvim/option.c
+++ b/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"
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index d413921a5f..686fe1f06d 100644
--- a/src/nvim/os/input.c
+++ b/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();
+}
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index 8ab61045dc..3bf1198b46 100644
--- a/src/nvim/os_unix.c
+++ b/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"
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index e88fb6f49e..4baba00ccf 100644
--- a/src/nvim/quickfix.c
+++ b/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"
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index c94a0bb16d..bb26066526 100644
--- a/src/nvim/screen.c
+++ b/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"
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index cb0990311a..fa786fdd74 100644
--- a/src/nvim/spell.c
+++ b/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"
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index d34014ac75..6c69b3b34a 100644
--- a/src/nvim/strings.c
+++ b/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"
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 7d2a9d8624..69d6479cf3 100644
--- a/src/nvim/syntax.c
+++ b/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"
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 8c160fea4f..fb39e069f0 100644
--- a/src/nvim/tag.c
+++ b/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"
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 2268fb05d4..803e7fab50 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -94,17 +94,6 @@ int ui_get_shellsize(void)
}
/*
- * 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.
*/
void ui_cursor_shape(void)