aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/api/buffer.c1
-rw-r--r--src/nvim/api/ui.c2
-rw-r--r--src/nvim/api/vim.c1
-rw-r--r--src/nvim/autocmd.c2
-rw-r--r--src/nvim/buffer.h2
-rw-r--r--src/nvim/edit.c1
-rw-r--r--src/nvim/eval/vars.c1
-rw-r--r--src/nvim/ex_getln.c1
-rw-r--r--src/nvim/hardcopy.c2
-rw-r--r--src/nvim/memory.c2
-rw-r--r--src/nvim/message.c1
-rw-r--r--src/nvim/mouse.c1
-rw-r--r--src/nvim/move.c1
-rw-r--r--src/nvim/normal.c2
-rw-r--r--src/nvim/popupmnu.c1
-rw-r--r--src/nvim/screen.c2
-rw-r--r--src/nvim/screen.h2
-rw-r--r--src/nvim/spell.c1
-rw-r--r--src/nvim/ui.c1
-rw-r--r--src/nvim/ui_compositor.c2
-rw-r--r--src/nvim/undo.c1
-rw-r--r--src/nvim/version.c1
-rw-r--r--src/nvim/window.c1
23 files changed, 24 insertions, 8 deletions
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index d3895d31cf..9bb3c680aa 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -28,6 +28,7 @@
#include "nvim/memory.h"
#include "nvim/move.h"
#include "nvim/ops.h"
+#include "nvim/screen.h"
#include "nvim/undo.h"
#include "nvim/vim.h"
#include "nvim/window.h"
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index 9cd4c97508..84cc77d8de 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -11,6 +11,7 @@
#include "nvim/api/ui.h"
#include "nvim/channel.h"
#include "nvim/cursor_shape.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/map.h"
#include "nvim/memory.h"
@@ -18,7 +19,6 @@
#include "nvim/msgpack_rpc/helpers.h"
#include "nvim/option.h"
#include "nvim/popupmnu.h"
-#include "nvim/screen.h"
#include "nvim/ui.h"
#include "nvim/vim.h"
#include "nvim/window.h"
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 2622f4bb81..3f9730c569 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -34,6 +34,7 @@
#include "nvim/fileio.h"
#include "nvim/getchar.h"
#include "nvim/globals.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/highlight_defs.h"
#include "nvim/highlight_group.h"
diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c
index 0d8efbb830..218aad0099 100644
--- a/src/nvim/autocmd.c
+++ b/src/nvim/autocmd.c
@@ -20,6 +20,7 @@
#include "nvim/ex_getln.h"
#include "nvim/fileio.h"
#include "nvim/getchar.h"
+#include "nvim/grid.h"
#include "nvim/insexpand.h"
#include "nvim/lua/executor.h"
#include "nvim/map.h"
@@ -28,6 +29,7 @@
#include "nvim/profile.h"
#include "nvim/regexp.h"
#include "nvim/runtime.h"
+#include "nvim/screen.h"
#include "nvim/search.h"
#include "nvim/state.h"
#include "nvim/ui_compositor.h"
diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h
index 70dda8eaec..7627b6a596 100644
--- a/src/nvim/buffer.h
+++ b/src/nvim/buffer.h
@@ -4,10 +4,10 @@
#include "nvim/eval/typval.h"
#include "nvim/ex_cmds_defs.h"
#include "nvim/func_attr.h"
+#include "nvim/grid_defs.h" // for StlClickRecord
#include "nvim/macros.h"
#include "nvim/memline.h"
#include "nvim/pos.h" // for linenr_T
-#include "nvim/screen.h" // for StlClickRecord
// Values for buflist_getfile()
enum getf_values {
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 7b4fb34883..4e8c3d1ed9 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -25,6 +25,7 @@
#include "nvim/fileio.h"
#include "nvim/fold.h"
#include "nvim/getchar.h"
+#include "nvim/grid.h"
#include "nvim/highlight_group.h"
#include "nvim/indent.h"
#include "nvim/indent_c.h"
diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c
index ffaf636208..c31179a30e 100644
--- a/src/nvim/eval/vars.c
+++ b/src/nvim/eval/vars.c
@@ -18,6 +18,7 @@
#include "nvim/ex_eval.h"
#include "nvim/ops.h"
#include "nvim/option.h"
+#include "nvim/screen.h"
#include "nvim/search.h"
#include "nvim/window.h"
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index f82f9d3bac..56d4deb245 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -39,6 +39,7 @@
#include "nvim/garray.h"
#include "nvim/getchar.h"
#include "nvim/globals.h"
+#include "nvim/grid.h"
#include "nvim/help.h"
#include "nvim/highlight.h"
#include "nvim/highlight_defs.h"
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c
index 9c522e11d8..fa357f864e 100644
--- a/src/nvim/hardcopy.c
+++ b/src/nvim/hardcopy.c
@@ -20,6 +20,7 @@
#include "nvim/ex_docmd.h"
#include "nvim/fileio.h"
#include "nvim/garray.h"
+#include "nvim/grid.h"
#include "nvim/hardcopy.h"
#include "nvim/highlight_group.h"
#include "nvim/mbyte.h"
@@ -31,7 +32,6 @@
#include "nvim/os/os.h"
#include "nvim/path.h"
#include "nvim/runtime.h"
-#include "nvim/screen.h"
#include "nvim/strings.h"
#include "nvim/syntax.h"
#include "nvim/ui.h"
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 13a0b79fb2..fb36d4ccf4 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -631,6 +631,7 @@ char *arena_memdupz(Arena *arena, const char *buf, size_t size)
# include "nvim/file_search.h"
# include "nvim/fold.h"
# include "nvim/getchar.h"
+# include "nvim/grid.h"
# include "nvim/mark.h"
# include "nvim/mbyte.h"
# include "nvim/memline.h"
@@ -642,7 +643,6 @@ char *arena_memdupz(Arena *arena, const char *buf, size_t size)
# include "nvim/path.h"
# include "nvim/quickfix.h"
# include "nvim/regexp.h"
-# include "nvim/screen.h"
# include "nvim/search.h"
# include "nvim/spell.h"
# include "nvim/syntax.h"
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 9041ef8d5c..338eddf49c 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -23,6 +23,7 @@
#include "nvim/func_attr.h"
#include "nvim/garray.h"
#include "nvim/getchar.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/input.h"
#include "nvim/keycodes.h"
diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c
index 41afc71a14..ef6f507b5c 100644
--- a/src/nvim/mouse.c
+++ b/src/nvim/mouse.c
@@ -9,6 +9,7 @@
#include "nvim/cursor.h"
#include "nvim/diff.h"
#include "nvim/fold.h"
+#include "nvim/grid.h"
#include "nvim/memline.h"
#include "nvim/mouse.h"
#include "nvim/move.h"
diff --git a/src/nvim/move.c b/src/nvim/move.c
index 3b95e59e8c..66bb9ef834 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -24,6 +24,7 @@
#include "nvim/edit.h"
#include "nvim/fold.h"
#include "nvim/getchar.h"
+#include "nvim/grid.h"
#include "nvim/mbyte.h"
#include "nvim/memline.h"
#include "nvim/move.h"
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 75ce1f83ff..38baa77eec 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -34,7 +34,7 @@
#include "nvim/fold.h"
#include "nvim/getchar.h"
#include "nvim/globals.h"
-#include "nvim/grid_defs.h"
+#include "nvim/grid.h"
#include "nvim/help.h"
#include "nvim/indent.h"
#include "nvim/keycodes.h"
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index 6cab847528..f8828b42ed 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -16,6 +16,7 @@
#include "nvim/edit.h"
#include "nvim/eval/typval.h"
#include "nvim/ex_cmds.h"
+#include "nvim/grid.h"
#include "nvim/insexpand.h"
#include "nvim/memline.h"
#include "nvim/memory.h"
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 5ffeb9425e..bc26efdae2 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -87,7 +87,7 @@
#include "nvim/fold.h"
#include "nvim/garray.h"
#include "nvim/getchar.h"
-#include "nvim/grid_defs.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/highlight_group.h"
#include "nvim/indent.h"
diff --git a/src/nvim/screen.h b/src/nvim/screen.h
index 9eda5223f1..04632631a5 100644
--- a/src/nvim/screen.h
+++ b/src/nvim/screen.h
@@ -4,7 +4,7 @@
#include <stdbool.h>
#include "nvim/buffer_defs.h"
-#include "nvim/grid.h"
+#include "nvim/grid_defs.h"
#include "nvim/pos.h"
#include "nvim/types.h"
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index c22a83fbb1..31ad4cdc28 100644
--- a/src/nvim/spell.c
+++ b/src/nvim/spell.c
@@ -92,6 +92,7 @@
#include "nvim/os_unix.h"
#include "nvim/path.h"
#include "nvim/regexp.h"
+#include "nvim/screen.h"
#include "nvim/search.h"
#include "nvim/spell.h"
#include "nvim/spellfile.h"
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index be0dda0a2f..1dce61a0c0 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -17,6 +17,7 @@
#include "nvim/ex_getln.h"
#include "nvim/fold.h"
#include "nvim/garray.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/log.h"
#include "nvim/main.h"
diff --git a/src/nvim/ui_compositor.c b/src/nvim/ui_compositor.c
index 5df70d0d8e..d960b2b785 100644
--- a/src/nvim/ui_compositor.c
+++ b/src/nvim/ui_compositor.c
@@ -13,6 +13,7 @@
#include "nvim/api/private/helpers.h"
#include "nvim/ascii.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/highlight_group.h"
#include "nvim/lib/kvec.h"
@@ -23,7 +24,6 @@
#include "nvim/message.h"
#include "nvim/os/os.h"
#include "nvim/popupmnu.h"
-#include "nvim/screen.h"
#include "nvim/ugrid.h"
#include "nvim/ui.h"
#include "nvim/ui_compositor.h"
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index ce8dede175..e453e2fb7f 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -107,6 +107,7 @@
#include "nvim/os_unix.h"
#include "nvim/path.h"
#include "nvim/pos.h" // MAXLNUM
+#include "nvim/screen.h"
#include "nvim/sha256.h"
#include "nvim/state.h"
#include "nvim/strings.h"
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b03cee432d..c01051fa54 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -14,6 +14,7 @@
#include "nvim/ascii.h"
#include "nvim/buffer.h"
#include "nvim/charset.h"
+#include "nvim/grid.h"
#include "nvim/iconv.h"
#include "nvim/lua/executor.h"
#include "nvim/memline.h"
diff --git a/src/nvim/window.c b/src/nvim/window.c
index b17245dd3d..d39a21eb42 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -26,6 +26,7 @@
#include "nvim/garray.h"
#include "nvim/getchar.h"
#include "nvim/globals.h"
+#include "nvim/grid.h"
#include "nvim/hashtab.h"
#include "nvim/main.h"
#include "nvim/mapping.h"