From df54d82b7c98ae5b1608c56e0dc216d77ebb3101 Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Fri, 10 Dec 2021 18:05:49 +0100
Subject: refactor(misc1): move out high-level input functions to a new file:
 input.c

Possibly dialog code is messages.c could be moved here as well.
misc1.c is now empty, so delete it.
---
 src/nvim/api/buffer.c          |   1 -
 src/nvim/aucmd.c               |   1 -
 src/nvim/autocmd.c             |   1 -
 src/nvim/buffer.c              |   1 -
 src/nvim/change.c              |   1 -
 src/nvim/channel.c             |   1 -
 src/nvim/charset.c             |   1 -
 src/nvim/cursor.c              |   1 -
 src/nvim/diff.c                |   1 -
 src/nvim/digraph.c             |   1 -
 src/nvim/edit.c                |   1 -
 src/nvim/eval.c                |   1 -
 src/nvim/eval/funcs.c          |   2 +-
 src/nvim/eval/typval.c         |   2 -
 src/nvim/eval/userfunc.c       |   1 -
 src/nvim/event/rstream.c       |   1 -
 src/nvim/ex_cmds.c             |   2 +-
 src/nvim/ex_cmds2.c            |   1 -
 src/nvim/ex_docmd.c            |   2 +-
 src/nvim/ex_getln.c            |   1 -
 src/nvim/ex_session.c          |   1 -
 src/nvim/file_search.c         |   1 -
 src/nvim/fileio.c              |   2 +-
 src/nvim/fold.c                |   1 -
 src/nvim/getchar.c             |   2 +-
 src/nvim/indent.c              |   1 -
 src/nvim/indent_c.c            |   1 -
 src/nvim/input.c               | 255 ++++++++++++++++++++++++++++++++
 src/nvim/input.h               |   9 ++
 src/nvim/lua/executor.c        |   1 -
 src/nvim/lua/stdlib.c          |   1 -
 src/nvim/main.c                |   1 -
 src/nvim/mbyte.c               |   1 -
 src/nvim/memline.c             |   2 +-
 src/nvim/memory.c              |   1 -
 src/nvim/menu.c                |   1 -
 src/nvim/message.c             |   2 +-
 src/nvim/misc1.c               | 327 -----------------------------------------
 src/nvim/misc1.h               |  10 --
 src/nvim/mouse.c               |  27 +++-
 src/nvim/move.c                |   1 -
 src/nvim/msgpack_rpc/channel.c |   1 -
 src/nvim/normal.c              |   1 -
 src/nvim/ops.c                 |   1 -
 src/nvim/option.c              |   1 -
 src/nvim/os/fs.c               |   1 -
 src/nvim/os/input.c            |   1 -
 src/nvim/os/shell.c            |   1 -
 src/nvim/os/signal.c           |   1 -
 src/nvim/os_unix.c             |   1 -
 src/nvim/path.c                |   1 -
 src/nvim/quickfix.c            |   1 -
 src/nvim/regexp.c              |   1 -
 src/nvim/runtime.c             |   1 -
 src/nvim/screen.c              |   1 -
 src/nvim/search.c              |   1 -
 src/nvim/spell.c               |   2 +-
 src/nvim/spellfile.c           |   1 -
 src/nvim/strings.c             |   1 -
 src/nvim/syntax.c              |   1 -
 src/nvim/tag.c                 |   2 +-
 src/nvim/terminal.c            |   1 -
 src/nvim/ui.c                  |   1 -
 src/nvim/undo.c                |   1 -
 src/nvim/window.c              |   1 -
 65 files changed, 299 insertions(+), 399 deletions(-)
 create mode 100644 src/nvim/input.c
 create mode 100644 src/nvim/input.h
 delete mode 100644 src/nvim/misc1.c
 delete mode 100644 src/nvim/misc1.h

(limited to 'src')

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 718743ed9c..7988bff25a 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -29,7 +29,6 @@
 #include "nvim/mark.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/ops.h"
 #include "nvim/undo.h"
diff --git a/src/nvim/aucmd.c b/src/nvim/aucmd.c
index a236b47027..d7f73fa4a1 100644
--- a/src/nvim/aucmd.c
+++ b/src/nvim/aucmd.c
@@ -8,7 +8,6 @@
 #include "nvim/ex_getln.h"
 #include "nvim/fileio.h"
 #include "nvim/main.h"
-#include "nvim/misc1.h"
 #include "nvim/os/os.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c
index 0248230e15..3780cad1d6 100644
--- a/src/nvim/autocmd.c
+++ b/src/nvim/autocmd.c
@@ -15,7 +15,6 @@
 #include "nvim/ex_docmd.h"
 #include "nvim/fileio.h"
 #include "nvim/getchar.h"
-#include "nvim/misc1.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
 #include "nvim/regexp.h"
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 297d9743df..89baea83f8 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -57,7 +57,6 @@
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
diff --git a/src/nvim/change.c b/src/nvim/change.c
index b6df2138af..1dbbfff024 100644
--- a/src/nvim/change.c
+++ b/src/nvim/change.c
@@ -19,7 +19,6 @@
 #include "nvim/indent_c.h"
 #include "nvim/mark.h"
 #include "nvim/memline.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
 #include "nvim/plines.h"
diff --git a/src/nvim/channel.c b/src/nvim/channel.c
index a662f3a951..cd5134fe5f 100644
--- a/src/nvim/channel.c
+++ b/src/nvim/channel.c
@@ -10,7 +10,6 @@
 #include "nvim/event/socket.h"
 #include "nvim/fileio.h"
 #include "nvim/lua/executor.h"
-#include "nvim/misc1.h"
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/msgpack_rpc/server.h"
 #include "nvim/os/shell.h"
diff --git a/src/nvim/charset.c b/src/nvim/charset.c
index eb0903b594..599d662993 100644
--- a/src/nvim/charset.c
+++ b/src/nvim/charset.c
@@ -21,7 +21,6 @@
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
 #include "nvim/os_unix.h"
diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c
index 4e1d7f9d78..6e2c6232d7 100644
--- a/src/nvim/cursor.c
+++ b/src/nvim/cursor.c
@@ -14,7 +14,6 @@
 #include "nvim/mark.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/plines.h"
 #include "nvim/screen.h"
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 4bc458c658..0233b3a5ab 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -29,7 +29,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index d1dd9b8309..8eda173cac 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -20,7 +20,6 @@
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/normal.h"
 #include "nvim/os/input.h"
 #include "nvim/screen.h"
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 424b6b40b1..2135d0bcd2 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -35,7 +35,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index d45aa8194c..86384bc5b2 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -35,7 +35,6 @@
 #include "nvim/lua/executor.h"
 #include "nvim/mark.h"
 #include "nvim/memline.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/ops.h"
 #include "nvim/option.h"
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 33ca4016cf..5252c940f7 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -33,12 +33,12 @@
 #include "nvim/if_cscope.h"
 #include "nvim/indent.h"
 #include "nvim/indent_c.h"
+#include "nvim/input.h"
 #include "nvim/lua/executor.h"
 #include "nvim/macros.h"
 #include "nvim/mark.h"
 #include "nvim/math.h"
 #include "nvim/memline.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/msgpack_rpc/channel.h"
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index dfb2500b49..11bbaaed9c 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -32,8 +32,6 @@
 #include "nvim/pos.h"
 #include "nvim/types.h"
 #include "nvim/vim.h"
-// TODO(ZyX-I): Move line_breakcheck out of misc1
-#include "nvim/misc1.h"  // For line_breakcheck
 #include "nvim/os/fileio.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index 9478a8441b..eb241eb8ae 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -17,7 +17,6 @@
 #include "nvim/getchar.h"
 #include "nvim/globals.h"
 #include "nvim/lua/executor.h"
-#include "nvim/misc1.h"
 #include "nvim/os/input.h"
 #include "nvim/regexp.h"
 #include "nvim/search.h"
diff --git a/src/nvim/event/rstream.c b/src/nvim/event/rstream.c
index 755307781c..3c43d1f98d 100644
--- a/src/nvim/event/rstream.c
+++ b/src/nvim/event/rstream.c
@@ -13,7 +13,6 @@
 #include "nvim/log.h"
 #include "nvim/memory.h"
 #include "nvim/main.h"
-#include "nvim/misc1.h"
 #include "nvim/vim.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index f95fe84f69..c0cb17fa61 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -39,6 +39,7 @@
 #include "nvim/getchar.h"
 #include "nvim/highlight.h"
 #include "nvim/indent.h"
+#include "nvim/input.h"
 #include "nvim/log.h"
 #include "nvim/main.h"
 #include "nvim/mark.h"
@@ -46,7 +47,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index 2dc098df8c..33f9477608 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -35,7 +35,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/ops.h"
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 4c040bff7f..9f0f8d93a3 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -39,6 +39,7 @@
 #include "nvim/globals.h"
 #include "nvim/hardcopy.h"
 #include "nvim/if_cscope.h"
+#include "nvim/input.h"
 #include "nvim/keymap.h"
 #include "nvim/lua/executor.h"
 #include "nvim/main.h"
@@ -48,7 +49,6 @@
 #include "nvim/memory.h"
 #include "nvim/menu.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 475f22d061..ba2238ace2 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -48,7 +48,6 @@
 #include "nvim/memory.h"
 #include "nvim/menu.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/ops.h"
diff --git a/src/nvim/ex_session.c b/src/nvim/ex_session.c
index f80a63560c..a37cad9f2d 100644
--- a/src/nvim/ex_session.c
+++ b/src/nvim/ex_session.c
@@ -28,7 +28,6 @@
 #include "nvim/getchar.h"
 #include "nvim/globals.h"
 #include "nvim/keymap.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c
index 5953a574f3..d31021b3ef 100644
--- a/src/nvim/file_search.c
+++ b/src/nvim/file_search.c
@@ -57,7 +57,6 @@
 #include "nvim/globals.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/option.h"
 #include "nvim/os/fs_defs.h"
 #include "nvim/os/input.h"
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 24428c2d9a..f8cf341836 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -30,12 +30,12 @@
 #include "nvim/getchar.h"
 #include "nvim/hashtab.h"
 #include "nvim/iconv.h"
+#include "nvim/input.h"
 #include "nvim/mbyte.h"
 #include "nvim/memfile.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 7806d3eada..b1d4321d4c 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -28,7 +28,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/ops.h"
 #include "nvim/option.h"
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 3385c12fac..05c38a5233 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -29,6 +29,7 @@
 #include "nvim/func_attr.h"
 #include "nvim/garray.h"
 #include "nvim/getchar.h"
+#include "nvim/input.h"
 #include "nvim/keymap.h"
 #include "nvim/lua/executor.h"
 #include "nvim/main.h"
@@ -36,7 +37,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/ops.h"
diff --git a/src/nvim/indent.c b/src/nvim/indent.c
index f49aff6643..8cc5bc2436 100644
--- a/src/nvim/indent.c
+++ b/src/nvim/indent.c
@@ -17,7 +17,6 @@
 #include "nvim/mark.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
 #include "nvim/plines.h"
diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c
index 3e3e07e9d6..faa9b38cf7 100644
--- a/src/nvim/indent_c.c
+++ b/src/nvim/indent_c.c
@@ -8,7 +8,6 @@
 
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
-#include "nvim/misc1.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/edit.h"
diff --git a/src/nvim/input.c b/src/nvim/input.c
new file mode 100644
index 0000000000..2f7c5c2c16
--- /dev/null
+++ b/src/nvim/input.c
@@ -0,0 +1,255 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
+// input.c: high level functions for prompting the user or input
+// like yes/no or number prompts.
+
+#include <inttypes.h>
+#include <stdbool.h>
+
+#include "nvim/func_attr.h"
+#include "nvim/getchar.h"
+#include "nvim/mbyte.h"
+#include "nvim/memory.h"
+#include "nvim/input.h"
+#include "nvim/mouse.h"
+#include "nvim/os/input.h"
+#include "nvim/ui.h"
+#include "nvim/vim.h"
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "input.c.generated.h"
+#endif
+
+/// Ask for a reply from the user, 'y' or 'n'
+///
+/// No other characters are accepted, the message is repeated until a valid
+/// reply is entered or <C-c> is hit.
+///
+/// @param[in]  str  Prompt: question to ask user. Is always followed by
+///                  " (y/n)?".
+/// @param[in]  direct  Determines what function to use to get user input. If
+///                     true then ui_inchar() will be used, otherwise vgetc().
+///                     I.e. when direct is true then characters are obtained
+///                     directly from the user without buffers involved.
+///
+/// @return 'y' or 'n'. Last is also what will be returned in case of interrupt.
+int ask_yesno(const char *const str, const bool direct)
+{
+  const int save_State = State;
+
+  no_wait_return++;
+  State = CONFIRM;  // Mouse behaves like with :confirm.
+  setmouse();  // Disable mouse in xterm.
+  no_mapping++;
+
+  int r = ' ';
+  while (r != 'y' && r != 'n') {
+    // Same highlighting as for wait_return.
+    smsg_attr(HL_ATTR(HLF_R), "%s (y/n)?", str);
+    if (direct) {
+      r = get_keystroke(NULL);
+    } else {
+      r = plain_vgetc();
+    }
+    if (r == Ctrl_C || r == ESC) {
+      r = 'n';
+    }
+    msg_putchar(r);  // Show what you typed.
+    ui_flush();
+  }
+  no_wait_return--;
+  State = save_State;
+  setmouse();
+  no_mapping--;
+
+  return r;
+}
+
+/// Get a key stroke directly from the user.
+///
+/// Ignores mouse clicks and scrollbar events, except a click for the left
+/// button (used at the more prompt).
+/// Doesn't use vgetc(), because it syncs undo and eats mapped characters.
+/// Disadvantage: typeahead is ignored.
+/// Translates the interrupt character for unix to ESC.
+int get_keystroke(MultiQueue *events)
+{
+  char_u *buf = NULL;
+  int buflen = 150;
+  int maxlen;
+  int len = 0;
+  int n;
+  int save_mapped_ctrl_c = mapped_ctrl_c;
+  int waited = 0;
+
+  mapped_ctrl_c = 0;        // mappings are not used here
+  for (;;) {
+    // flush output before waiting
+    ui_flush();
+    // Leave some room for check_termcode() to insert a key code into (max
+    // 5 chars plus NUL).  And fix_input_buffer() can triple the number of
+    // bytes.
+    maxlen = (buflen - 6 - len) / 3;
+    if (buf == NULL) {
+      buf = xmalloc((size_t)buflen);
+    } else if (maxlen < 10) {
+      // Need some more space. This might happen when receiving a long
+      // escape sequence.
+      buflen += 100;
+      buf = xrealloc(buf, (size_t)buflen);
+      maxlen = (buflen - 6 - len) / 3;
+    }
+
+    // First time: blocking wait.  Second time: wait up to 100ms for a
+    // terminal code to complete.
+    n = os_inchar(buf + len, maxlen, len == 0 ? -1L : 100L, 0, events);
+    if (n > 0) {
+      // Replace zero and CSI by a special key code.
+      n = fix_input_buffer(buf + len, n);
+      len += n;
+      waited = 0;
+    } else if (len > 0) {
+      waited++;             // keep track of the waiting time
+    }
+    if (n > 0) {  // found a termcode: adjust length
+      len = n;
+    }
+    if (len == 0) {  // nothing typed yet
+      continue;
+    }
+
+    // Handle modifier and/or special key code.
+    n = buf[0];
+    if (n == K_SPECIAL) {
+      n = TO_SPECIAL(buf[1], buf[2]);
+      if (buf[1] == KS_MODIFIER
+          || n == K_IGNORE
+          || (is_mouse_key(n) && n != K_LEFTMOUSE)) {
+        if (buf[1] == KS_MODIFIER) {
+          mod_mask = buf[2];
+        }
+        len -= 3;
+        if (len > 0) {
+          memmove(buf, buf + 3, (size_t)len);
+        }
+        continue;
+      }
+      break;
+    }
+    if (MB_BYTE2LEN(n) > len) {
+      // more bytes to get.
+      continue;
+    }
+    buf[len >= buflen ? buflen - 1 : len] = NUL;
+    n = utf_ptr2char(buf);
+    break;
+  }
+  xfree(buf);
+
+  mapped_ctrl_c = save_mapped_ctrl_c;
+  return n;
+}
+
+/// Get a number from the user.
+/// When "mouse_used" is not NULL allow using the mouse.
+///
+/// @param colon  allow colon to abort
+int get_number(int colon, int *mouse_used)
+{
+  int n = 0;
+  int c;
+  int typed = 0;
+
+  if (mouse_used != NULL) {
+    *mouse_used = false;
+  }
+
+  // When not printing messages, the user won't know what to type, return a
+  // zero (as if CR was hit).
+  if (msg_silent != 0) {
+    return 0;
+  }
+
+  no_mapping++;
+  for (;;) {
+    ui_cursor_goto(msg_row, msg_col);
+    c = safe_vgetc();
+    if (ascii_isdigit(c)) {
+      n = n * 10 + c - '0';
+      msg_putchar(c);
+      typed++;
+    } else if (c == K_DEL || c == K_KDEL || c == K_BS || c == Ctrl_H) {
+      if (typed > 0) {
+        msg_puts("\b \b");
+        typed--;
+      }
+      n /= 10;
+    } else if (mouse_used != NULL && c == K_LEFTMOUSE) {
+      *mouse_used = true;
+      n = mouse_row + 1;
+      break;
+    } else if (n == 0 && c == ':' && colon) {
+      stuffcharReadbuff(':');
+      if (!exmode_active) {
+        cmdline_row = msg_row;
+      }
+      skip_redraw = true;           // skip redraw once
+      do_redraw = false;
+      break;
+    } else if (c == Ctrl_C || c == ESC || c == 'q') {
+      n = 0;
+      break;
+    } else if (c == CAR || c == NL) {
+      break;
+    }
+  }
+  no_mapping--;
+  return n;
+}
+
+/// Ask the user to enter a number.
+///
+/// When "mouse_used" is not NULL allow using the mouse and in that case return
+/// the line number.
+int prompt_for_number(int *mouse_used)
+{
+  int i;
+  int save_cmdline_row;
+  int save_State;
+
+  // When using ":silent" assume that <CR> was entered.
+  if (mouse_used != NULL) {
+    msg_puts(_("Type number and <Enter> or click with the mouse "
+               "(q or empty cancels): "));
+  } else {
+    msg_puts(_("Type number and <Enter> (q or empty cancels): "));
+  }
+
+  // Set the state such that text can be selected/copied/pasted and we still
+  // get mouse events.
+  save_cmdline_row = cmdline_row;
+  cmdline_row = 0;
+  save_State = State;
+  State = ASKMORE;  // prevents a screen update when using a timer
+  // May show different mouse shape.
+  setmouse();
+
+  i = get_number(true, mouse_used);
+  if (KeyTyped) {
+    // don't call wait_return() now
+    if (msg_row > 0) {
+      cmdline_row = msg_row - 1;
+    }
+    need_wait_return = false;
+    msg_didany = false;
+    msg_didout = false;
+  } else {
+    cmdline_row = save_cmdline_row;
+  }
+  State = save_State;
+  // May need to restore mouse shape.
+  setmouse();
+
+  return i;
+}
diff --git a/src/nvim/input.h b/src/nvim/input.h
new file mode 100644
index 0000000000..7975f21215
--- /dev/null
+++ b/src/nvim/input.h
@@ -0,0 +1,9 @@
+#ifndef NVIM_INPUT_H
+#define NVIM_INPUT_H
+
+#include "nvim/vim.h"
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "input.h.generated.h"
+#endif
+#endif  // NVIM_INPUT_H
diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c
index a899ca63ac..b09d133495 100644
--- a/src/nvim/lua/executor.c
+++ b/src/nvim/lua/executor.c
@@ -31,7 +31,6 @@
 #include "nvim/map.h"
 #include "nvim/memline.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/os/os.h"
 #include "nvim/screen.h"
diff --git a/src/nvim/lua/stdlib.c b/src/nvim/lua/stdlib.c
index b5553060a1..b746e03625 100644
--- a/src/nvim/lua/stdlib.c
+++ b/src/nvim/lua/stdlib.c
@@ -34,7 +34,6 @@
 #include "nvim/map.h"
 #include "nvim/memline.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/os/os.h"
 #include "nvim/regexp.h"
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 29510e26ff..cbd1f53727 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -39,7 +39,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index bbb54fa1e7..ce44f6c619 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -49,7 +49,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/option.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 40da4b48f8..08521c0dc3 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -51,6 +51,7 @@
 #include "nvim/fileio.h"
 #include "nvim/func_attr.h"
 #include "nvim/getchar.h"
+#include "nvim/input.h"
 #include "nvim/main.h"
 #include "nvim/mark.h"
 #include "nvim/mbyte.h"
@@ -58,7 +59,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 3d621ebbb7..677ff8f522 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -17,7 +17,6 @@
 #include "nvim/memfile.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/sign.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
diff --git a/src/nvim/menu.c b/src/nvim/menu.c
index d596b31062..ac4d52c392 100644
--- a/src/nvim/menu.c
+++ b/src/nvim/menu.c
@@ -22,7 +22,6 @@
 #include "nvim/memory.h"
 #include "nvim/menu.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/screen.h"
 #include "nvim/state.h"
 #include "nvim/strings.h"
diff --git a/src/nvim/message.c b/src/nvim/message.c
index f4bc34d1a5..befca8c76b 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -23,12 +23,12 @@
 #include "nvim/garray.h"
 #include "nvim/getchar.h"
 #include "nvim/highlight.h"
+#include "nvim/input.h"
 #include "nvim/keymap.h"
 #include "nvim/main.h"
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/normal.h"
 #include "nvim/ops.h"
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
deleted file mode 100644
index 6fcc1f0f82..0000000000
--- a/src/nvim/misc1.c
+++ /dev/null
@@ -1,327 +0,0 @@
-// This is an open source non-commercial project. Dear PVS-Studio, please check
-// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-/*
- * misc1.c: functions that didn't seem to fit elsewhere
- */
-
-#include <assert.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "nvim/ascii.h"
-#include "nvim/buffer.h"
-#include "nvim/buffer_updates.h"
-#include "nvim/charset.h"
-#include "nvim/cursor.h"
-#include "nvim/diff.h"
-#include "nvim/edit.h"
-#include "nvim/eval.h"
-#include "nvim/event/stream.h"
-#include "nvim/ex_cmds.h"
-#include "nvim/ex_docmd.h"
-#include "nvim/ex_getln.h"
-#include "nvim/fileio.h"
-#include "nvim/fold.h"
-#include "nvim/func_attr.h"
-#include "nvim/garray.h"
-#include "nvim/getchar.h"
-#include "nvim/indent.h"
-#include "nvim/indent_c.h"
-#include "nvim/main.h"
-#include "nvim/mbyte.h"
-#include "nvim/memline.h"
-#include "nvim/memory.h"
-#include "nvim/message.h"
-#include "nvim/misc1.h"
-#include "nvim/mouse.h"
-#include "nvim/move.h"
-#include "nvim/option.h"
-#include "nvim/os/input.h"
-#include "nvim/os/os.h"
-#include "nvim/os/shell.h"
-#include "nvim/os/signal.h"
-#include "nvim/os/time.h"
-#include "nvim/os_unix.h"
-#include "nvim/quickfix.h"
-#include "nvim/regexp.h"
-#include "nvim/screen.h"
-#include "nvim/search.h"
-#include "nvim/state.h"
-#include "nvim/strings.h"
-#include "nvim/tag.h"
-#include "nvim/ui.h"
-#include "nvim/undo.h"
-#include "nvim/vim.h"
-#include "nvim/window.h"
-
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "misc1.c.generated.h"
-#endif
-
-/// Ask for a reply from the user, 'y' or 'n'
-///
-/// No other characters are accepted, the message is repeated until a valid
-/// reply is entered or <C-c> is hit.
-///
-/// @param[in]  str  Prompt: question to ask user. Is always followed by
-///                  " (y/n)?".
-/// @param[in]  direct  Determines what function to use to get user input. If
-///                     true then ui_inchar() will be used, otherwise vgetc().
-///                     I.e. when direct is true then characters are obtained
-///                     directly from the user without buffers involved.
-///
-/// @return 'y' or 'n'. Last is also what will be returned in case of interrupt.
-int ask_yesno(const char *const str, const bool direct)
-{
-  const int save_State = State;
-
-  no_wait_return++;
-  State = CONFIRM;  // Mouse behaves like with :confirm.
-  setmouse();  // Disable mouse in xterm.
-  no_mapping++;
-
-  int r = ' ';
-  while (r != 'y' && r != 'n') {
-    // Same highlighting as for wait_return.
-    smsg_attr(HL_ATTR(HLF_R), "%s (y/n)?", str);
-    if (direct) {
-      r = get_keystroke(NULL);
-    } else {
-      r = plain_vgetc();
-    }
-    if (r == Ctrl_C || r == ESC) {
-      r = 'n';
-    }
-    msg_putchar(r);  // Show what you typed.
-    ui_flush();
-  }
-  no_wait_return--;
-  State = save_State;
-  setmouse();
-  no_mapping--;
-
-  return r;
-}
-
-/*
- * Return TRUE if "c" is a mouse key.
- */
-int is_mouse_key(int c)
-{
-  return c == K_LEFTMOUSE
-         || c == K_LEFTMOUSE_NM
-         || c == K_LEFTDRAG
-         || c == K_LEFTRELEASE
-         || c == K_LEFTRELEASE_NM
-         || c == K_MOUSEMOVE
-         || c == K_MIDDLEMOUSE
-         || c == K_MIDDLEDRAG
-         || c == K_MIDDLERELEASE
-         || c == K_RIGHTMOUSE
-         || c == K_RIGHTDRAG
-         || c == K_RIGHTRELEASE
-         || c == K_MOUSEDOWN
-         || c == K_MOUSEUP
-         || c == K_MOUSELEFT
-         || c == K_MOUSERIGHT
-         || c == K_X1MOUSE
-         || c == K_X1DRAG
-         || c == K_X1RELEASE
-         || c == K_X2MOUSE
-         || c == K_X2DRAG
-         || c == K_X2RELEASE;
-}
-
-/*
- * Get a key stroke directly from the user.
- * Ignores mouse clicks and scrollbar events, except a click for the left
- * button (used at the more prompt).
- * Doesn't use vgetc(), because it syncs undo and eats mapped characters.
- * Disadvantage: typeahead is ignored.
- * Translates the interrupt character for unix to ESC.
- */
-int get_keystroke(MultiQueue *events)
-{
-  char_u *buf = NULL;
-  int buflen = 150;
-  int maxlen;
-  int len = 0;
-  int n;
-  int save_mapped_ctrl_c = mapped_ctrl_c;
-  int waited = 0;
-
-  mapped_ctrl_c = 0;        // mappings are not used here
-  for (;;) {
-    // flush output before waiting
-    ui_flush();
-    // Leave some room for check_termcode() to insert a key code into (max
-    // 5 chars plus NUL).  And fix_input_buffer() can triple the number of
-    // bytes.
-    maxlen = (buflen - 6 - len) / 3;
-    if (buf == NULL) {
-      buf = xmalloc((size_t)buflen);
-    } else if (maxlen < 10) {
-      // Need some more space. This might happen when receiving a long
-      // escape sequence.
-      buflen += 100;
-      buf = xrealloc(buf, (size_t)buflen);
-      maxlen = (buflen - 6 - len) / 3;
-    }
-
-    // First time: blocking wait.  Second time: wait up to 100ms for a
-    // terminal code to complete.
-    n = os_inchar(buf + len, maxlen, len == 0 ? -1L : 100L, 0, events);
-    if (n > 0) {
-      // Replace zero and CSI by a special key code.
-      n = fix_input_buffer(buf + len, n);
-      len += n;
-      waited = 0;
-    } else if (len > 0) {
-      ++waited;             // keep track of the waiting time
-    }
-    if (n > 0) {  // found a termcode: adjust length
-      len = n;
-    }
-    if (len == 0) {  // nothing typed yet
-      continue;
-    }
-
-    // Handle modifier and/or special key code.
-    n = buf[0];
-    if (n == K_SPECIAL) {
-      n = TO_SPECIAL(buf[1], buf[2]);
-      if (buf[1] == KS_MODIFIER
-          || n == K_IGNORE
-          || (is_mouse_key(n) && n != K_LEFTMOUSE)) {
-        if (buf[1] == KS_MODIFIER) {
-          mod_mask = buf[2];
-        }
-        len -= 3;
-        if (len > 0) {
-          memmove(buf, buf + 3, (size_t)len);
-        }
-        continue;
-      }
-      break;
-    }
-    if (MB_BYTE2LEN(n) > len) {
-      // more bytes to get.
-      continue;
-    }
-    buf[len >= buflen ? buflen - 1 : len] = NUL;
-    n = utf_ptr2char(buf);
-    break;
-  }
-  xfree(buf);
-
-  mapped_ctrl_c = save_mapped_ctrl_c;
-  return n;
-}
-
-/// Get a number from the user.
-/// When "mouse_used" is not NULL allow using the mouse.
-///
-/// @param colon  allow colon to abort
-int get_number(int colon, int *mouse_used)
-{
-  int n = 0;
-  int c;
-  int typed = 0;
-
-  if (mouse_used != NULL) {
-    *mouse_used = FALSE;
-  }
-
-  // When not printing messages, the user won't know what to type, return a
-  // zero (as if CR was hit).
-  if (msg_silent != 0) {
-    return 0;
-  }
-
-  no_mapping++;
-  for (;;) {
-    ui_cursor_goto(msg_row, msg_col);
-    c = safe_vgetc();
-    if (ascii_isdigit(c)) {
-      n = n * 10 + c - '0';
-      msg_putchar(c);
-      ++typed;
-    } else if (c == K_DEL || c == K_KDEL || c == K_BS || c == Ctrl_H) {
-      if (typed > 0) {
-        msg_puts("\b \b");
-        --typed;
-      }
-      n /= 10;
-    } else if (mouse_used != NULL && c == K_LEFTMOUSE) {
-      *mouse_used = TRUE;
-      n = mouse_row + 1;
-      break;
-    } else if (n == 0 && c == ':' && colon) {
-      stuffcharReadbuff(':');
-      if (!exmode_active) {
-        cmdline_row = msg_row;
-      }
-      skip_redraw = true;           // skip redraw once
-      do_redraw = false;
-      break;
-    } else if (c == Ctrl_C || c == ESC || c == 'q') {
-      n = 0;
-      break;
-    } else if (c == CAR || c == NL) {
-      break;
-    }
-  }
-  no_mapping--;
-  return n;
-}
-
-/*
- * Ask the user to enter a number.
- * When "mouse_used" is not NULL allow using the mouse and in that case return
- * the line number.
- */
-int prompt_for_number(int *mouse_used)
-{
-  int i;
-  int save_cmdline_row;
-  int save_State;
-
-  // When using ":silent" assume that <CR> was entered.
-  if (mouse_used != NULL) {
-    msg_puts(_("Type number and <Enter> or click with the mouse "
-               "(q or empty cancels): "));
-  } else {
-    msg_puts(_("Type number and <Enter> (q or empty cancels): "));
-  }
-
-  /* Set the state such that text can be selected/copied/pasted and we still
-   * get mouse events. */
-  save_cmdline_row = cmdline_row;
-  cmdline_row = 0;
-  save_State = State;
-  State = ASKMORE;  // prevents a screen update when using a timer
-  // May show different mouse shape.
-  setmouse();
-
-  i = get_number(TRUE, mouse_used);
-  if (KeyTyped) {
-    // don't call wait_return() now
-    if (msg_row > 0) {
-      cmdline_row = msg_row - 1;
-    }
-    need_wait_return = false;
-    msg_didany = false;
-    msg_didout = false;
-  } else {
-    cmdline_row = save_cmdline_row;
-  }
-  State = save_State;
-  // May need to restore mouse shape.
-  setmouse();
-
-  return i;
-}
-
diff --git a/src/nvim/misc1.h b/src/nvim/misc1.h
deleted file mode 100644
index 14ca361073..0000000000
--- a/src/nvim/misc1.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef NVIM_MISC1_H
-#define NVIM_MISC1_H
-
-#include "nvim/os/shell.h"
-#include "nvim/vim.h"
-
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "misc1.h.generated.h"
-#endif
-#endif  // NVIM_MISC1_H
diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c
index 386094e509..5d007fb173 100644
--- a/src/nvim/mouse.c
+++ b/src/nvim/mouse.c
@@ -10,7 +10,6 @@
 #include "nvim/diff.h"
 #include "nvim/fold.h"
 #include "nvim/memline.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/os_unix.h"
@@ -31,6 +30,32 @@
 static linenr_T orig_topline = 0;
 static int orig_topfill = 0;
 
+/// Return true if "c" is a mouse key.
+bool is_mouse_key(int c)
+{
+  return c == K_LEFTMOUSE
+         || c == K_LEFTMOUSE_NM
+         || c == K_LEFTDRAG
+         || c == K_LEFTRELEASE
+         || c == K_LEFTRELEASE_NM
+         || c == K_MOUSEMOVE
+         || c == K_MIDDLEMOUSE
+         || c == K_MIDDLEDRAG
+         || c == K_MIDDLERELEASE
+         || c == K_RIGHTMOUSE
+         || c == K_RIGHTDRAG
+         || c == K_RIGHTRELEASE
+         || c == K_MOUSEDOWN
+         || c == K_MOUSEUP
+         || c == K_MOUSELEFT
+         || c == K_MOUSERIGHT
+         || c == K_X1MOUSE
+         || c == K_X1DRAG
+         || c == K_X1RELEASE
+         || c == K_X2MOUSE
+         || c == K_X2DRAG
+         || c == K_X2RELEASE;
+}
 /// Move the cursor to the specified row and column on the screen.
 /// Change current window if necessary. Returns an integer with the
 /// CURSOR_MOVED bit set if the cursor has moved or unset otherwise.
diff --git a/src/nvim/move.c b/src/nvim/move.c
index ff3f744eff..0a672000e4 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -26,7 +26,6 @@
 #include "nvim/getchar.h"
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
 #include "nvim/plines.h"
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index a1a1f0f8c0..299651ee97 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -24,7 +24,6 @@
 #include "nvim/map.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/msgpack_rpc/helpers.h"
 #include "nvim/os/input.h"
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 9332c55b5f..95a521c0d8 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -40,7 +40,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 52c382028e..9bc63477e9 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -38,7 +38,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 05929193b8..2ceb1bd992 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -55,7 +55,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index e9963516fc..24c7678633 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -21,7 +21,6 @@
 #include "nvim/assert.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/option.h"
 #include "nvim/os/os.h"
 #include "nvim/os/os_defs.h"
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index fc9bbbc8b0..3790eba212 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -17,7 +17,6 @@
 #include "nvim/main.h"
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
-#include "nvim/misc1.h"
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/os/input.h"
 #include "nvim/state.h"
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index 2c74234e1e..e618b2788b 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -21,7 +21,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/option_defs.h"
 #include "nvim/os/shell.h"
 #include "nvim/os/signal.h"
diff --git a/src/nvim/os/signal.c b/src/nvim/os/signal.c
index 0d125ec964..a8bf68a1a2 100644
--- a/src/nvim/os/signal.c
+++ b/src/nvim/os/signal.c
@@ -18,7 +18,6 @@
 #include "nvim/main.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
-#include "nvim/misc1.h"
 #include "nvim/os/signal.h"
 #include "nvim/vim.h"
 
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index 9396a5896a..1398dba0e4 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -20,7 +20,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/msgpack_rpc/helpers.h"
 #include "nvim/os/input.h"
diff --git a/src/nvim/path.c b/src/nvim/path.c
index 01ac88d537..674d67e21a 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -18,7 +18,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 6a192d148f..2204e2a62a 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -27,7 +27,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index aa8d1503fc..45e580dbee 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -64,7 +64,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/os/input.h"
 #include "nvim/plines.h"
 #include "nvim/garray.h"
diff --git a/src/nvim/runtime.c b/src/nvim/runtime.c
index be365d4ab8..1c04cb16b3 100644
--- a/src/nvim/runtime.c
+++ b/src/nvim/runtime.c
@@ -12,7 +12,6 @@
 #include "nvim/ex_cmds.h"
 #include "nvim/ex_cmds2.h"
 #include "nvim/lua/executor.h"
-#include "nvim/misc1.h"
 #include "nvim/option.h"
 #include "nvim/os/os.h"
 #include "nvim/runtime.h"
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 0d06c45229..a938a3b062 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -98,7 +98,6 @@
 #include "nvim/memory.h"
 #include "nvim/menu.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
diff --git a/src/nvim/search.c b/src/nvim/search.c
index b4aa4bbf26..3a8b72e4f9 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -32,7 +32,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index 85d1e139bf..bd31e98faa 100644
--- a/src/nvim/spell.c
+++ b/src/nvim/spell.c
@@ -94,12 +94,12 @@
 #include "nvim/garray.h"
 #include "nvim/getchar.h"
 #include "nvim/hashtab.h"
+#include "nvim/input.h"
 #include "nvim/mark.h"
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
diff --git a/src/nvim/spellfile.c b/src/nvim/spellfile.c
index c65fcc1180..8069549cc6 100644
--- a/src/nvim/spellfile.c
+++ b/src/nvim/spellfile.c
@@ -237,7 +237,6 @@
 #include "nvim/fileio.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
-#include "nvim/misc1.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index 27f93fe4ce..e2a8108c45 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -31,7 +31,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/ops.h"
 #include "nvim/option.h"
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index a39f78b751..a9447165c2 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -32,7 +32,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 483d2df778..a10a2a0c32 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -25,11 +25,11 @@
 #include "nvim/fold.h"
 #include "nvim/garray.h"
 #include "nvim/if_cscope.h"
+#include "nvim/input.h"
 #include "nvim/mark.h"
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index 2d32b6bac4..04068a3cb8 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -64,7 +64,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 6006a8f957..1aadaf5c9d 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -23,7 +23,6 @@
 #include "nvim/main.h"
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index a9d2323c3f..d18f35a43a 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -99,7 +99,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
diff --git a/src/nvim/window.c b/src/nvim/window.c
index be963d8374..c711f462d1 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -30,7 +30,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc1.h"
 #include "nvim/mouse.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
-- 
cgit