aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-11-27 18:37:35 +0800
committerGitHub <noreply@github.com>2023-11-27 18:37:35 +0800
commitacf525287950277e7b83794184e3df5dcfdecc48 (patch)
treee31224f05d196d13bf8a057cc6aa8809ee5ed9f0
parenta03bd2b87882c2a7e0c9e63dadcb2e5fabda1670 (diff)
downloadrneovim-acf525287950277e7b83794184e3df5dcfdecc48.tar.gz
rneovim-acf525287950277e7b83794184e3df5dcfdecc48.tar.bz2
rneovim-acf525287950277e7b83794184e3df5dcfdecc48.zip
refactor: remove vim.h from more headers (#26244)
-rw-r--r--src/nvim/api/private/helpers.h4
-rw-r--r--src/nvim/eval/encode.h1
-rw-r--r--src/nvim/main.c5
-rw-r--r--src/nvim/msgpack_rpc/channel_defs.h1
4 files changed, 7 insertions, 4 deletions
diff --git a/src/nvim/api/private/helpers.h b/src/nvim/api/private/helpers.h
index 82c24b7c65..56ca9b2057 100644
--- a/src/nvim/api/private/helpers.h
+++ b/src/nvim/api/private/helpers.h
@@ -2,11 +2,13 @@
#include <stdbool.h>
#include <stddef.h>
+#include <stdint.h>
#include "klib/kvec.h"
#include "nvim/api/private/defs.h"
#include "nvim/api/private/dispatch.h"
#include "nvim/decoration.h"
+#include "nvim/eval/typval_defs.h"
#include "nvim/ex_eval_defs.h"
#include "nvim/getchar.h"
#include "nvim/gettext.h"
@@ -14,7 +16,7 @@
#include "nvim/macros.h"
#include "nvim/map.h"
#include "nvim/memory.h"
-#include "nvim/vim.h"
+#include "nvim/message.h"
#define OBJECT_OBJ(o) o
diff --git a/src/nvim/eval/encode.h b/src/nvim/eval/encode.h
index 15a8277b7c..26a3286f2b 100644
--- a/src/nvim/eval/encode.h
+++ b/src/nvim/eval/encode.h
@@ -9,7 +9,6 @@
#include "nvim/eval/typval.h"
#include "nvim/eval/typval_defs.h"
#include "nvim/garray_defs.h"
-#include "nvim/vim.h"
/// Convert Vimscript value to msgpack string
///
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 4dc2d59182..b6072eb2e4 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -17,6 +17,10 @@
# include <sanitizer/ubsan_interface.h>
#endif
+// uncrustify:off
+#include "nvim/vim.h"
+// uncrustify:on
+
#include "nvim/arglist.h"
#include "nvim/ascii.h"
#include "nvim/autocmd.h"
@@ -82,7 +86,6 @@
#include "nvim/ui_client.h"
#include "nvim/ui_compositor.h"
#include "nvim/version.h"
-#include "nvim/vim.h"
#include "nvim/window.h"
#ifdef MSWIN
# include "nvim/os/os_win_console.h"
diff --git a/src/nvim/msgpack_rpc/channel_defs.h b/src/nvim/msgpack_rpc/channel_defs.h
index 1e3f8a72c1..1eb57ec4dc 100644
--- a/src/nvim/msgpack_rpc/channel_defs.h
+++ b/src/nvim/msgpack_rpc/channel_defs.h
@@ -10,7 +10,6 @@
#include "nvim/event/process.h"
#include "nvim/event/socket.h"
#include "nvim/map.h"
-#include "nvim/vim.h"
typedef struct Channel Channel;
typedef struct Unpacker Unpacker;