3 files changed, 29 insertions, 26 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 68ae000c35..ca9b4184bc 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -60,6 +60,7 @@
 #include "nvim/os/time.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
+#include "nvim/os/event.h"
 #include "nvim/os/signal.h"
 #include "nvim/msgpack_rpc/helpers.h"
 #include "nvim/api/private/defs.h"
@@ -252,14 +253,12 @@ int main(int argc, char **argv)
    */
 
 
-  /*
-   * mch_init() sets up the terminal (window) for use.  This must be
-   * done after resetting full_screen, otherwise it may move the cursor
-   * Note that we may use mch_exit() before mch_init()!
-   */
-  mch_init();
+  // term_init() sets up the terminal (window) for use.  This must be
+  // done after resetting full_screen, otherwise it may move the cursor
+  term_init();
   TIME_MSG("shell init");
 
+  event_init();
 
   if (!embedded_mode) {
     // Print a warning if stdout is not a terminal.
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index bcb35e297b..2595e2e5a2 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -130,26 +130,6 @@ void mch_suspend(void)
 #endif
 }
 
-void mch_init(void)
-{
-  Columns = 80;
-  Rows = 24;
-
-  // Prevent buffering output.
-  // Output gets explicitly buffered and flushed by out_flush() at times like,
-  // for example, when the user presses a key. Without this line, vim will not
-  // render the screen correctly.
-  setbuf(stdout, NULL);
-
-  out_flush();
-
-#ifdef MACOS_CONVERT
-  mac_conv_init();
-#endif
-
-  event_init();
-}
-
 static int get_x11_title(int test_only)
 {
   return FALSE;
diff --git a/src/nvim/term.c b/src/nvim/term.c
index 18620ea766..fd2988c850 100644
--- a/src/nvim/term.c
+++ b/src/nvim/term.c
@@ -1010,6 +1010,30 @@ static struct builtin_term builtin_termcaps[] =
 # define DEFAULT_TERM   (char_u *)"dumb"
 #endif
 
+/// Sets up the terminal window for use.
+///
+/// This must be done after resetting full_screen, otherwise it may move the
+/// cursor.
+///
+/// @remark We may call mch_exit() before calling this.
+void term_init(void)
+{
+  Columns = 80;
+  Rows = 24;
+
+  // Prevent buffering output.
+  // Output gets explicitly buffered and flushed by out_flush() at times like,
+  // for example, when the user presses a key. Without this line, vim will not
+  // render the screen correctly.
+  setbuf(stdout, NULL);
+
+  out_flush();
+
+#ifdef MACOS_CONVERT
+  mac_conv_init();
+#endif
+}
+
 /*
  * Term_strings contains currently used terminal output strings.
  * It is initialized with the default values by parse_builtin_tcap().