From f4aedbae4cb1f206f5b7c6142697b71dd473059b Mon Sep 17 00:00:00 2001 From: dundargoc Date: Mon, 27 Nov 2023 18:39:38 +0100 Subject: [PATCH] build(IWYU): fix includes for undo_defs.h --- Makefile | 1 - src/clint.py | 1 - src/nvim/api/buffer.c | 2 +- src/nvim/api/command.c | 2 +- src/nvim/api/deprecated.c | 2 +- src/nvim/api/extmark.c | 2 +- src/nvim/api/private/helpers.c | 2 +- src/nvim/api/vim.c | 2 +- src/nvim/api/win_config.c | 2 +- src/nvim/api/window.c | 2 +- src/nvim/arglist.c | 2 +- src/nvim/autocmd.h | 2 +- src/nvim/buffer.c | 2 +- src/nvim/buffer.h | 2 +- src/nvim/buffer_defs.h | 2 +- src/nvim/buffer_updates.c | 2 +- src/nvim/buffer_updates.h | 2 +- src/nvim/bufwrite.c | 2 +- src/nvim/bufwrite.h | 2 +- src/nvim/change.c | 2 +- src/nvim/change.h | 2 +- src/nvim/charset.c | 2 +- src/nvim/charset.h | 2 +- src/nvim/cursor.c | 2 +- src/nvim/cursor.h | 2 +- src/nvim/debugger.c | 2 +- src/nvim/decoration.c | 2 +- src/nvim/decoration.h | 2 +- src/nvim/decoration_provider.c | 2 +- src/nvim/diff.c | 2 +- src/nvim/diff.h | 2 +- src/nvim/drawline.c | 2 +- src/nvim/drawline.h | 2 +- src/nvim/drawscreen.c | 2 +- src/nvim/edit.c | 2 +- src/nvim/edit.h | 2 +- src/nvim/eval.c | 2 +- src/nvim/eval/buffer.c | 2 +- src/nvim/eval/funcs.c | 2 +- src/nvim/eval/typval.c | 2 +- src/nvim/eval/typval_defs.h | 2 +- src/nvim/eval/userfunc.h | 2 +- src/nvim/eval/window.c | 2 +- src/nvim/eval/window.h | 2 +- src/nvim/ex_cmds.c | 2 +- src/nvim/ex_cmds.h | 2 +- src/nvim/ex_cmds2.c | 2 +- src/nvim/ex_cmds_defs.h | 2 +- src/nvim/ex_docmd.c | 2 +- src/nvim/ex_eval_defs.h | 2 +- src/nvim/ex_getln.c | 2 +- src/nvim/ex_session.c | 2 +- src/nvim/extmark.c | 2 +- src/nvim/extmark.h | 2 +- src/nvim/fileio.c | 2 +- src/nvim/fileio.h | 2 +- src/nvim/fold.c | 2 +- src/nvim/fold.h | 2 +- src/nvim/fold_defs.h | 2 +- src/nvim/getchar.c | 2 +- src/nvim/grid.h | 2 +- src/nvim/grid_defs.h | 2 +- src/nvim/help.c | 2 +- src/nvim/indent.c | 2 +- src/nvim/indent.h | 2 +- src/nvim/indent_c.c | 2 +- src/nvim/indent_c.h | 2 +- src/nvim/insexpand.c | 2 +- src/nvim/insexpand.h | 2 +- src/nvim/linematch.c | 2 +- src/nvim/linematch.h | 2 +- src/nvim/lua/executor.c | 2 +- src/nvim/lua/stdlib.c | 2 +- src/nvim/lua/treesitter.c | 2 +- src/nvim/lua/xdiff.c | 2 +- src/nvim/mapping.c | 2 +- src/nvim/mark.h | 2 +- src/nvim/mark_defs.h | 2 +- src/nvim/marktree.c | 2 +- src/nvim/marktree.h | 2 +- src/nvim/match.c | 2 +- src/nvim/mbyte.c | 2 +- src/nvim/memfile.c | 2 +- src/nvim/memfile_defs.h | 2 +- src/nvim/memline.c | 2 +- src/nvim/memline.h | 2 +- src/nvim/menu.c | 2 +- src/nvim/message.c | 2 +- src/nvim/mouse.c | 2 +- src/nvim/move.c | 2 +- src/nvim/normal.h | 2 +- src/nvim/ops.h | 2 +- src/nvim/option.c | 2 +- src/nvim/optionstr.c | 2 +- src/nvim/os/shell.c | 2 +- src/nvim/plines.c | 2 +- src/nvim/plines.h | 2 +- src/nvim/popupmenu.c | 2 +- src/nvim/{pos.h => pos_defs.h} | 0 src/nvim/profile.c | 2 +- src/nvim/quickfix.c | 2 +- src/nvim/quickfix.h | 2 +- src/nvim/regexp.c | 2 +- src/nvim/regexp.h | 2 +- src/nvim/regexp_defs.h | 2 +- src/nvim/runtime.h | 2 +- src/nvim/search.h | 2 +- src/nvim/shada.c | 2 +- src/nvim/sign.c | 2 +- src/nvim/spell.c | 2 +- src/nvim/spellfile.c | 2 +- src/nvim/spellsuggest.c | 2 +- src/nvim/statusline.c | 2 +- src/nvim/syntax.c | 2 +- src/nvim/tag.c | 2 +- src/nvim/terminal.c | 2 +- src/nvim/textformat.c | 2 +- src/nvim/textformat.h | 2 +- src/nvim/textobject.c | 2 +- src/nvim/textobject.h | 2 +- src/nvim/undo.c | 2 +- src/nvim/undo.h | 2 +- src/nvim/undo_defs.h | 2 +- src/nvim/vim.h | 2 +- src/nvim/window.c | 2 +- src/nvim/winfloat.c | 2 +- 126 files changed, 123 insertions(+), 125 deletions(-) rename src/nvim/{pos.h => pos_defs.h} (100%) diff --git a/Makefile b/Makefile index e65a39e9f0..d1c73f507d 100644 --- a/Makefile +++ b/Makefile @@ -291,7 +291,6 @@ iwyu: build/.ran-cmake |src/nvim/ui_client.h\ |src/nvim/ui_compositor.h\ |src/nvim/undo.h\ - |src/nvim/undo_defs.h\ |src/nvim/usercmd.h\ |src/nvim/version.h\ |src/nvim/vim.h\ diff --git a/src/clint.py b/src/clint.py index 13c2978cf4..7a26f71064 100755 --- a/src/clint.py +++ b/src/clint.py @@ -1046,7 +1046,6 @@ def CheckIncludes(filename, lines, error): "src/nvim/ui_client.h", "src/nvim/ui_compositor.h", "src/nvim/undo.h", - "src/nvim/undo_defs.h", "src/nvim/usercmd.h", "src/nvim/version.h", "src/nvim/vim.h", diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c index 5a9ddaae41..6bf0aeb4a7 100644 --- a/src/nvim/api/buffer.c +++ b/src/nvim/api/buffer.c @@ -33,7 +33,7 @@ #include "nvim/memory.h" #include "nvim/move.h" #include "nvim/ops.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/api/command.c b/src/nvim/api/command.c index 4af475d400..e44e4052ca 100644 --- a/src/nvim/api/command.c +++ b/src/nvim/api/command.c @@ -26,7 +26,7 @@ #include "nvim/mbyte.h" #include "nvim/memory.h" #include "nvim/ops.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/strings.h" #include "nvim/types.h" diff --git a/src/nvim/api/deprecated.c b/src/nvim/api/deprecated.c index b57cf80c9f..cac7d1ded9 100644 --- a/src/nvim/api/deprecated.c +++ b/src/nvim/api/deprecated.c @@ -21,7 +21,7 @@ #include "nvim/lua/executor.h" #include "nvim/memory.h" #include "nvim/option.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "api/deprecated.c.generated.h" diff --git a/src/nvim/api/extmark.c b/src/nvim/api/extmark.c index b7bc57e52c..98074da139 100644 --- a/src/nvim/api/extmark.c +++ b/src/nvim/api/extmark.c @@ -22,7 +22,7 @@ #include "nvim/mbyte.h" #include "nvim/memline.h" #include "nvim/memory.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/sign.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c index fac23dfaaa..33defa63ef 100644 --- a/src/nvim/api/private/helpers.c +++ b/src/nvim/api/private/helpers.c @@ -31,7 +31,7 @@ #include "nvim/memory.h" #include "nvim/message.h" #include "nvim/msgpack_rpc/helpers.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" #include "nvim/ui.h" #include "nvim/version.h" diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 2823319b06..5a206471fa 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -58,7 +58,7 @@ #include "nvim/os/os_defs.h" #include "nvim/os/process.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/runtime.h" #include "nvim/sign.h" #include "nvim/state.h" diff --git a/src/nvim/api/win_config.c b/src/nvim/api/win_config.c index 72a1c952b0..bec369b907 100644 --- a/src/nvim/api/win_config.c +++ b/src/nvim/api/win_config.c @@ -20,7 +20,7 @@ #include "nvim/mbyte.h" #include "nvim/memory.h" #include "nvim/option.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/syntax.h" #include "nvim/ui.h" #include "nvim/window.h" diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index 08cd6f881f..1fb7eaba95 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -22,7 +22,7 @@ #include "nvim/message.h" #include "nvim/move.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" #include "nvim/window.h" diff --git a/src/nvim/arglist.c b/src/nvim/arglist.c index 7895dc8333..37c860565c 100644 --- a/src/nvim/arglist.c +++ b/src/nvim/arglist.c @@ -33,7 +33,7 @@ #include "nvim/option_vars.h" #include "nvim/os/input.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/types.h" #include "nvim/undo.h" diff --git a/src/nvim/autocmd.h b/src/nvim/autocmd.h index 52256a953f..566c5f5149 100644 --- a/src/nvim/autocmd.h +++ b/src/nvim/autocmd.h @@ -11,7 +11,7 @@ #include "nvim/eval/typval_defs.h" // IWYU pragma: keep #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep #include "nvim/macros.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" // Set by the apply_autocmds_group function if the given event is equal to diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 8526147287..12013c3c5b 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -84,7 +84,7 @@ #include "nvim/os/time.h" #include "nvim/path.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/quickfix.h" #include "nvim/regexp.h" #include "nvim/runtime.h" diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h index 6069022178..00bbced55a 100644 --- a/src/nvim/buffer.h +++ b/src/nvim/buffer.h @@ -13,7 +13,7 @@ #include "nvim/macros.h" #include "nvim/memline.h" #include "nvim/memline_defs.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" // Values for buflist_getfile() enum getf_values { diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h index 0e7e5723cd..d3b80c8891 100644 --- a/src/nvim/buffer_defs.h +++ b/src/nvim/buffer_defs.h @@ -28,7 +28,7 @@ typedef struct { #include "nvim/mark_defs.h" #include "nvim/marktree.h" #include "nvim/option_vars.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/statusline_defs.h" #include "nvim/undo_defs.h" diff --git a/src/nvim/buffer_updates.c b/src/nvim/buffer_updates.c index 2d1c568cb3..8840e67847 100644 --- a/src/nvim/buffer_updates.c +++ b/src/nvim/buffer_updates.c @@ -19,7 +19,7 @@ #include "nvim/memline.h" #include "nvim/memory.h" #include "nvim/msgpack_rpc/channel.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/buffer_updates.h b/src/nvim/buffer_updates.h index 5e40657537..ca5246c571 100644 --- a/src/nvim/buffer_updates.h +++ b/src/nvim/buffer_updates.h @@ -4,7 +4,7 @@ #include "nvim/buffer_defs.h" // IWYU pragma: keep #include "nvim/extmark.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "buffer_updates.h.generated.h" diff --git a/src/nvim/bufwrite.c b/src/nvim/bufwrite.c index 8569e3b281..fe2341f900 100644 --- a/src/nvim/bufwrite.c +++ b/src/nvim/bufwrite.c @@ -40,7 +40,7 @@ #include "nvim/os/input.h" #include "nvim/os/os.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/sha256.h" #include "nvim/strings.h" #include "nvim/types.h" diff --git a/src/nvim/bufwrite.h b/src/nvim/bufwrite.h index 41e1911d7c..38d4d7745e 100644 --- a/src/nvim/bufwrite.h +++ b/src/nvim/bufwrite.h @@ -2,7 +2,7 @@ #include "nvim/buffer_defs.h" // IWYU pragma: keep #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "bufwrite.h.generated.h" diff --git a/src/nvim/change.c b/src/nvim/change.c index c0380b57df..2949ebaf62 100644 --- a/src/nvim/change.c +++ b/src/nvim/change.c @@ -39,7 +39,7 @@ #include "nvim/option_vars.h" #include "nvim/os/time.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/search.h" #include "nvim/spell.h" #include "nvim/state.h" diff --git a/src/nvim/change.h b/src/nvim/change.h index 34cea981d1..1c90b67fe3 100644 --- a/src/nvim/change.h +++ b/src/nvim/change.h @@ -1,7 +1,7 @@ #pragma once #include "nvim/buffer_defs.h" // IWYU pragma: keep -#include "nvim/pos.h" +#include "nvim/pos_defs.h" // flags for open_line() #define OPENLINE_DELSPACES 0x01 // delete spaces after cursor diff --git a/src/nvim/charset.c b/src/nvim/charset.c index 64b2044dc8..515c06f2d8 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -25,7 +25,7 @@ #include "nvim/memory.h" #include "nvim/option.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/strings.h" #include "nvim/vim.h" diff --git a/src/nvim/charset.h b/src/nvim/charset.h index 79ae20c29b..cfab0f8517 100644 --- a/src/nvim/charset.h +++ b/src/nvim/charset.h @@ -7,7 +7,7 @@ #include "nvim/eval/typval_defs.h" #include "nvim/option_defs.h" #include "nvim/option_vars.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/strings.h" /// Return the folded-case equivalent of the given character diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c index 32ee1d6c08..9434f33ae5 100644 --- a/src/nvim/cursor.c +++ b/src/nvim/cursor.c @@ -20,7 +20,7 @@ #include "nvim/option.h" #include "nvim/option_vars.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/state.h" #include "nvim/vim.h" diff --git a/src/nvim/cursor.h b/src/nvim/cursor.h index bd70ccfe60..ea63f7c1e5 100644 --- a/src/nvim/cursor.h +++ b/src/nvim/cursor.h @@ -1,7 +1,7 @@ #pragma once #include "nvim/buffer_defs.h" // IWYU pragma: keep -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "cursor.h.generated.h" diff --git a/src/nvim/debugger.c b/src/nvim/debugger.c index 1568418df4..17e88c7962 100644 --- a/src/nvim/debugger.c +++ b/src/nvim/debugger.c @@ -29,7 +29,7 @@ #include "nvim/message.h" #include "nvim/os/os.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/runtime.h" #include "nvim/vim.h" diff --git a/src/nvim/decoration.c b/src/nvim/decoration.c index e0fde50d8d..503d81f742 100644 --- a/src/nvim/decoration.c +++ b/src/nvim/decoration.c @@ -19,7 +19,7 @@ #include "nvim/memory.h" #include "nvim/move.h" #include "nvim/option_vars.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/sign.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/decoration.h b/src/nvim/decoration.h index e2fcb5bc00..ac05962049 100644 --- a/src/nvim/decoration.h +++ b/src/nvim/decoration.h @@ -10,7 +10,7 @@ #include "nvim/extmark_defs.h" #include "nvim/macros.h" #include "nvim/marktree.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" // actual Decor* data is in decoration_defs.h diff --git a/src/nvim/decoration_provider.c b/src/nvim/decoration_provider.c index 852a4c4b10..172eb569c9 100644 --- a/src/nvim/decoration_provider.c +++ b/src/nvim/decoration_provider.c @@ -14,7 +14,7 @@ #include "nvim/log.h" #include "nvim/lua/executor.h" #include "nvim/message.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" static kvec_t(DecorProvider) decor_providers = KV_INITIAL_VALUE; diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 36e2678cbe..339e1d4c30 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -51,7 +51,7 @@ #include "nvim/os/os.h" #include "nvim/os/shell.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/strings.h" #include "nvim/types.h" #include "nvim/ui.h" diff --git a/src/nvim/diff.h b/src/nvim/diff.h index a9c80333ec..944523430b 100644 --- a/src/nvim/diff.h +++ b/src/nvim/diff.h @@ -4,7 +4,7 @@ #include "nvim/ex_cmds_defs.h" #include "nvim/macros.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" // Value set from 'diffopt'. EXTERN int diff_context INIT( = 6); // context for folds diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index 188d7f68c6..e388c24630 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -35,7 +35,7 @@ #include "nvim/option.h" #include "nvim/option_vars.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/quickfix.h" #include "nvim/sign.h" #include "nvim/spell.h" diff --git a/src/nvim/drawline.h b/src/nvim/drawline.h index 747e062bf9..edec7fea44 100644 --- a/src/nvim/drawline.h +++ b/src/nvim/drawline.h @@ -7,7 +7,7 @@ #include "nvim/decoration_provider.h" #include "nvim/fold.h" #include "nvim/macros.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" // Maximum columns for terminal highlight attributes diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c index d6301da4b0..364293ed11 100644 --- a/src/nvim/drawscreen.c +++ b/src/nvim/drawscreen.c @@ -95,7 +95,7 @@ #include "nvim/os/os_defs.h" #include "nvim/plines.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/regexp.h" #include "nvim/search.h" diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 1020b34795..20a6770705 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -51,7 +51,7 @@ #include "nvim/os/input.h" #include "nvim/plines.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/search.h" #include "nvim/state.h" #include "nvim/strings.h" diff --git a/src/nvim/edit.h b/src/nvim/edit.h index 33087f718f..7cf4141045 100644 --- a/src/nvim/edit.h +++ b/src/nvim/edit.h @@ -2,7 +2,7 @@ #include "nvim/autocmd_defs.h" // IWYU pragma: keep #include "nvim/buffer_defs.h" // IWYU pragma: keep -#include "nvim/pos.h" +#include "nvim/pos_defs.h" // Values for in_cinkeys() #define KEY_OPEN_FORW 0x101 diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 701e6dd32d..d02d9e0b49 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -68,7 +68,7 @@ #include "nvim/os/shell.h" #include "nvim/os/stdpaths_defs.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/quickfix.h" #include "nvim/regexp.h" diff --git a/src/nvim/eval/buffer.c b/src/nvim/eval/buffer.c index 0a36107596..2665fa0503 100644 --- a/src/nvim/eval/buffer.c +++ b/src/nvim/eval/buffer.c @@ -21,7 +21,7 @@ #include "nvim/memory.h" #include "nvim/move.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/sign.h" #include "nvim/types.h" #include "nvim/undo.h" diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 6ed992941a..56958224ca 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -100,7 +100,7 @@ #include "nvim/path.h" #include "nvim/plines.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/regexp.h" #include "nvim/runtime.h" diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c index 936e043b6a..036346aed7 100644 --- a/src/nvim/eval/typval.c +++ b/src/nvim/eval/typval.c @@ -31,7 +31,7 @@ #include "nvim/memory.h" #include "nvim/message.h" #include "nvim/os/input.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/strings.h" #include "nvim/types.h" #include "nvim/vim.h" diff --git a/src/nvim/eval/typval_defs.h b/src/nvim/eval/typval_defs.h index 3c539863f8..98710d4c51 100644 --- a/src/nvim/eval/typval_defs.h +++ b/src/nvim/eval/typval_defs.h @@ -6,7 +6,7 @@ #include "nvim/garray_defs.h" #include "nvim/hashtab.h" #include "nvim/lib/queue.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" /// Type used for Vimscript VAR_NUMBER values diff --git a/src/nvim/eval/userfunc.h b/src/nvim/eval/userfunc.h index 4c4d35177e..1c666f72ff 100644 --- a/src/nvim/eval/userfunc.h +++ b/src/nvim/eval/userfunc.h @@ -9,7 +9,7 @@ #include "nvim/ex_cmds_defs.h" #include "nvim/garray_defs.h" #include "nvim/hashtab.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" struct funccal_entry; diff --git a/src/nvim/eval/window.c b/src/nvim/eval/window.c index bcc29dfeed..db19d0c25f 100644 --- a/src/nvim/eval/window.c +++ b/src/nvim/eval/window.c @@ -22,7 +22,7 @@ #include "nvim/memory.h" #include "nvim/message.h" #include "nvim/move.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/eval/window.h b/src/nvim/eval/window.h index fa9b9c41d4..aa3becf30b 100644 --- a/src/nvim/eval/window.h +++ b/src/nvim/eval/window.h @@ -12,7 +12,7 @@ #include "nvim/option_defs.h" #include "nvim/option_vars.h" #include "nvim/os/fs.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 996d88e1f8..802a688ed0 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -73,7 +73,7 @@ #include "nvim/os/time.h" #include "nvim/path.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/quickfix.h" #include "nvim/regexp.h" diff --git a/src/nvim/ex_cmds.h b/src/nvim/ex_cmds.h index 7b7889e71f..529009415b 100644 --- a/src/nvim/ex_cmds.h +++ b/src/nvim/ex_cmds.h @@ -6,7 +6,7 @@ #include "nvim/eval/typval_defs.h" #include "nvim/ex_cmds_defs.h" // IWYU pragma: export #include "nvim/os/time.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" // flags for do_ecmd() #define ECMD_HIDE 0x01 // don't free the current buffer diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 1353aa2412..3f5047db8b 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -36,7 +36,7 @@ #include "nvim/option_vars.h" #include "nvim/os/os_defs.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/quickfix.h" #include "nvim/runtime.h" #include "nvim/undo.h" diff --git a/src/nvim/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h index 9359c6ed12..ffdb4ba6af 100644 --- a/src/nvim/ex_cmds_defs.h +++ b/src/nvim/ex_cmds_defs.h @@ -6,7 +6,7 @@ #include "nvim/eval/typval_defs.h" #include "nvim/ex_eval_defs.h" #include "nvim/normal.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 8337990540..58a7fa7d35 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -69,7 +69,7 @@ #include "nvim/os/shell.h" #include "nvim/path.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/quickfix.h" #include "nvim/regexp.h" diff --git a/src/nvim/ex_eval_defs.h b/src/nvim/ex_eval_defs.h index 61ef4508ef..c7231bb315 100644 --- a/src/nvim/ex_eval_defs.h +++ b/src/nvim/ex_eval_defs.h @@ -2,7 +2,7 @@ #include -#include "nvim/pos.h" +#include "nvim/pos_defs.h" /// A list used for saving values of "emsg_silent". Used by ex_try() to save the /// value of "emsg_silent" if it was non-zero. When this is done, the CSF_SILENT diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 0d2247ead8..7d8d63d569 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -62,7 +62,7 @@ #include "nvim/os/os.h" #include "nvim/path.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/regexp.h" #include "nvim/search.h" diff --git a/src/nvim/ex_session.c b/src/nvim/ex_session.c index f63d236b39..faacadb5a4 100644 --- a/src/nvim/ex_session.c +++ b/src/nvim/ex_session.c @@ -33,7 +33,7 @@ #include "nvim/os/fs.h" #include "nvim/os/os.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/runtime.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/extmark.c b/src/nvim/extmark.c index bc8d794906..f50c271990 100644 --- a/src/nvim/extmark.c +++ b/src/nvim/extmark.c @@ -37,7 +37,7 @@ #include "nvim/map.h" #include "nvim/marktree.h" #include "nvim/memline.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/undo.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/extmark.h b/src/nvim/extmark.h index d89a59f95a..0a2c809532 100644 --- a/src/nvim/extmark.h +++ b/src/nvim/extmark.h @@ -10,7 +10,7 @@ #include "nvim/extmark_defs.h" // IWYU pragma: export #include "nvim/macros.h" #include "nvim/marktree.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" EXTERN int extmark_splice_pending INIT( = 0); diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index fa9e8d74ff..3d251e1f0a 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -56,7 +56,7 @@ #include "nvim/os/os.h" #include "nvim/os/time.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/sha256.h" #include "nvim/shada.h" diff --git a/src/nvim/fileio.h b/src/nvim/fileio.h index d3a0e8c54a..d1f6561507 100644 --- a/src/nvim/fileio.h +++ b/src/nvim/fileio.h @@ -10,7 +10,7 @@ #include "nvim/garray_defs.h" // IWYU pragma: keep #include "nvim/globals.h" #include "nvim/os/fs_defs.h" // IWYU pragma: keep -#include "nvim/pos.h" +#include "nvim/pos_defs.h" // Values for readfile() flags #define READ_NEW 0x01 // read a file into a new buffer diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 61c67991cd..1fc3f93c4a 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -43,7 +43,7 @@ #include "nvim/option_vars.h" #include "nvim/os/input.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/search.h" #include "nvim/strings.h" #include "nvim/syntax.h" diff --git a/src/nvim/fold.h b/src/nvim/fold.h index 630b673b58..4b2d2cccee 100644 --- a/src/nvim/fold.h +++ b/src/nvim/fold.h @@ -6,7 +6,7 @@ #include "nvim/fold_defs.h" // IWYU pragma: export #include "nvim/garray_defs.h" // IWYU pragma: keep #include "nvim/macros.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" EXTERN int disable_fold_update INIT( = 0); diff --git a/src/nvim/fold_defs.h b/src/nvim/fold_defs.h index f11481ead6..20a5805769 100644 --- a/src/nvim/fold_defs.h +++ b/src/nvim/fold_defs.h @@ -1,6 +1,6 @@ #pragma once -#include "nvim/pos.h" +#include "nvim/pos_defs.h" // Info used to pass info about a fold from the fold-detection code to the // code that displays the foldcolumn. diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 4a9f861d77..d0007a7a38 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -51,7 +51,7 @@ #include "nvim/os/input.h" #include "nvim/os/os.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/state.h" #include "nvim/strings.h" #include "nvim/types.h" diff --git a/src/nvim/grid.h b/src/nvim/grid.h index 0a0fe68cde..565fd02806 100644 --- a/src/nvim/grid.h +++ b/src/nvim/grid.h @@ -8,7 +8,7 @@ #include "nvim/grid_defs.h" // IWYU pragma: export #include "nvim/macros.h" #include "nvim/mbyte.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" /// By default, all windows are drawn on a single rectangular grid, represented by /// this ScreenGrid instance. In multigrid mode each window will have its own diff --git a/src/nvim/grid_defs.h b/src/nvim/grid_defs.h index 3cc2d788d3..990b2959a4 100644 --- a/src/nvim/grid_defs.h +++ b/src/nvim/grid_defs.h @@ -4,7 +4,7 @@ #include #include -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" // Includes final NUL. MAX_MCO is no longer used, but at least 4*(MAX_MCO+1)+1=29 diff --git a/src/nvim/help.c b/src/nvim/help.c index bf8adff2a9..5123edc2db 100644 --- a/src/nvim/help.c +++ b/src/nvim/help.c @@ -34,7 +34,7 @@ #include "nvim/os/input.h" #include "nvim/os/os.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/runtime.h" #include "nvim/strings.h" #include "nvim/syntax.h" diff --git a/src/nvim/indent.c b/src/nvim/indent.c index 35252cf7e4..3b3f59f995 100644 --- a/src/nvim/indent.c +++ b/src/nvim/indent.c @@ -33,7 +33,7 @@ #include "nvim/optionstr.h" #include "nvim/os/input.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/search.h" #include "nvim/strings.h" diff --git a/src/nvim/indent.h b/src/nvim/indent.h index c35338637f..aa33e7cd93 100644 --- a/src/nvim/indent.h +++ b/src/nvim/indent.h @@ -2,7 +2,7 @@ #include "nvim/buffer_defs.h" // IWYU pragma: keep #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" typedef int (*IndentGetter)(void); diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c index be4aa6bad3..a6d01be197 100644 --- a/src/nvim/indent_c.c +++ b/src/nvim/indent_c.c @@ -20,7 +20,7 @@ #include "nvim/option.h" #include "nvim/option_vars.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/search.h" #include "nvim/strings.h" #include "nvim/vim.h" diff --git a/src/nvim/indent_c.h b/src/nvim/indent_c.h index aa82bde4dc..82de7369b4 100644 --- a/src/nvim/indent_c.h +++ b/src/nvim/indent_c.h @@ -1,7 +1,7 @@ #pragma once #include "nvim/buffer_defs.h" // IWYU pragma: keep -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "indent_c.h.generated.h" diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index 92fc6c6906..bb973a5e1b 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -49,7 +49,7 @@ #include "nvim/os/time.h" #include "nvim/path.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/search.h" #include "nvim/spell.h" diff --git a/src/nvim/insexpand.h b/src/nvim/insexpand.h index 164aa5edce..deccc60d4a 100644 --- a/src/nvim/insexpand.h +++ b/src/nvim/insexpand.h @@ -2,7 +2,7 @@ #include "nvim/macros.h" #include "nvim/option_defs.h" // IWYU pragma: keep -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" #include "nvim/vim.h" diff --git a/src/nvim/linematch.c b/src/nvim/linematch.c index d835bd5dc1..fca62cfcc8 100644 --- a/src/nvim/linematch.c +++ b/src/nvim/linematch.c @@ -8,7 +8,7 @@ #include "nvim/linematch.h" #include "nvim/macros.h" #include "nvim/memory.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #define LN_MAX_BUFS 8 #define LN_DECISION_MAX 255 // pow(2, LN_MAX_BUFS(8)) - 1 = 255 diff --git a/src/nvim/linematch.h b/src/nvim/linematch.h index 2d765b0b70..3f3cdae171 100644 --- a/src/nvim/linematch.h +++ b/src/nvim/linematch.h @@ -2,7 +2,7 @@ #include // IWYU pragma: keep -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "linematch.h.generated.h" diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c index 9ff217af84..7e35296995 100644 --- a/src/nvim/lua/executor.c +++ b/src/nvim/lua/executor.c @@ -51,7 +51,7 @@ #include "nvim/os/fileio.h" #include "nvim/os/os.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/runtime.h" #include "nvim/strings.h" diff --git a/src/nvim/lua/stdlib.c b/src/nvim/lua/stdlib.c index dafc24fea1..c0815133aa 100644 --- a/src/nvim/lua/stdlib.c +++ b/src/nvim/lua/stdlib.c @@ -33,7 +33,7 @@ #include "nvim/mbyte.h" #include "nvim/memline.h" #include "nvim/memory.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/runtime.h" #include "nvim/types.h" diff --git a/src/nvim/lua/treesitter.c b/src/nvim/lua/treesitter.c index e5de369ed9..90767e0c50 100644 --- a/src/nvim/lua/treesitter.c +++ b/src/nvim/lua/treesitter.c @@ -24,7 +24,7 @@ #include "nvim/map.h" #include "nvim/memline.h" #include "nvim/memory.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/strings.h" #include "nvim/types.h" diff --git a/src/nvim/lua/xdiff.c b/src/nvim/lua/xdiff.c index bf52ae4232..6ce88400d1 100644 --- a/src/nvim/lua/xdiff.c +++ b/src/nvim/lua/xdiff.c @@ -13,7 +13,7 @@ #include "nvim/lua/xdiff.h" #include "nvim/macros.h" #include "nvim/memory.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/vim.h" #include "xdiff/xdiff.h" diff --git a/src/nvim/mapping.c b/src/nvim/mapping.c index 0b71569c89..94c93b436d 100644 --- a/src/nvim/mapping.c +++ b/src/nvim/mapping.c @@ -39,7 +39,7 @@ #include "nvim/message.h" #include "nvim/option_defs.h" #include "nvim/option_vars.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/regexp_defs.h" #include "nvim/runtime.h" diff --git a/src/nvim/mark.h b/src/nvim/mark.h index ee84b00797..d338871df0 100644 --- a/src/nvim/mark.h +++ b/src/nvim/mark.h @@ -12,7 +12,7 @@ #include "nvim/mark_defs.h" // IWYU pragma: export #include "nvim/memory.h" #include "nvim/os/time.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" /// Set fmark using given value #define SET_FMARK(fmarkp_, mark_, fnum_, view_) \ diff --git a/src/nvim/mark_defs.h b/src/nvim/mark_defs.h index 0e4fcc5889..c488cf2e1a 100644 --- a/src/nvim/mark_defs.h +++ b/src/nvim/mark_defs.h @@ -2,7 +2,7 @@ #include "nvim/eval/typval_defs.h" #include "nvim/os/time.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" // marks: positions in a file // (a normal mark is a lnum/col pair, the same as a file position) diff --git a/src/nvim/marktree.c b/src/nvim/marktree.c index cffeb077f8..7a06d9d453 100644 --- a/src/nvim/marktree.c +++ b/src/nvim/marktree.c @@ -53,7 +53,7 @@ #include "nvim/garray.h" #include "nvim/marktree.h" #include "nvim/memory.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" // only for debug functions #include "nvim/api/private/defs.h" #include "nvim/api/private/helpers.h" diff --git a/src/nvim/marktree.h b/src/nvim/marktree.h index 9fb83b8b98..b55a961c3b 100644 --- a/src/nvim/marktree.h +++ b/src/nvim/marktree.h @@ -10,7 +10,7 @@ #include "nvim/decoration_defs.h" #include "nvim/garray_defs.h" #include "nvim/map.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" // only for debug functions: #include "nvim/api/private/defs.h" diff --git a/src/nvim/match.c b/src/nvim/match.c index 670cf6ea16..aab676c207 100644 --- a/src/nvim/match.c +++ b/src/nvim/match.c @@ -28,7 +28,7 @@ #include "nvim/memory.h" #include "nvim/message.h" #include "nvim/option_vars.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/regexp.h" #include "nvim/strings.h" diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index a2c0e70d77..e2bae06817 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -62,7 +62,7 @@ #include "nvim/option_vars.h" #include "nvim/optionstr.h" #include "nvim/os/os.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/strings.h" #include "nvim/types.h" #include "nvim/vim.h" diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c index 5b64144187..9fc6492dad 100644 --- a/src/nvim/memfile.c +++ b/src/nvim/memfile.c @@ -59,7 +59,7 @@ #include "nvim/os/input.h" #include "nvim/os/os.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/vim.h" #define MEMFILE_PAGE_SIZE 4096 /// default page size diff --git a/src/nvim/memfile_defs.h b/src/nvim/memfile_defs.h index 1ed5a1cb62..58ffa8ff74 100644 --- a/src/nvim/memfile_defs.h +++ b/src/nvim/memfile_defs.h @@ -5,7 +5,7 @@ #include #include "nvim/map.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" /// A block number. diff --git a/src/nvim/memline.c b/src/nvim/memline.c index de2ab5b8b3..5b3534ec91 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -79,7 +79,7 @@ #include "nvim/os/process.h" #include "nvim/os/time.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/spell.h" #include "nvim/statusline.h" #include "nvim/strings.h" diff --git a/src/nvim/memline.h b/src/nvim/memline.h index 8a49c4faaf..2cbe8f753b 100644 --- a/src/nvim/memline.h +++ b/src/nvim/memline.h @@ -2,7 +2,7 @@ #include "nvim/buffer_defs.h" // IWYU pragma: keep #include "nvim/memline_defs.h" // IWYU pragma: export -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/menu.c b/src/nvim/menu.c index d15fc7e7bc..d541745112 100644 --- a/src/nvim/menu.c +++ b/src/nvim/menu.c @@ -30,7 +30,7 @@ #include "nvim/message.h" #include "nvim/option_vars.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/state.h" #include "nvim/strings.h" #include "nvim/types.h" diff --git a/src/nvim/message.c b/src/nvim/message.c index 01ca361d5e..06badf85a1 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -47,7 +47,7 @@ #include "nvim/os/input.h" #include "nvim/os/os.h" #include "nvim/os/time.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/runtime.h" #include "nvim/strings.h" diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c index 2c7438df48..babd4e353e 100644 --- a/src/nvim/mouse.c +++ b/src/nvim/mouse.c @@ -34,7 +34,7 @@ #include "nvim/option_vars.h" #include "nvim/plines.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/search.h" #include "nvim/state.h" #include "nvim/statusline.h" diff --git a/src/nvim/move.c b/src/nvim/move.c index 94711c64d5..15164603f2 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -39,7 +39,7 @@ #include "nvim/option_vars.h" #include "nvim/plines.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/search.h" #include "nvim/sign_defs.h" #include "nvim/strings.h" diff --git a/src/nvim/normal.h b/src/nvim/normal.h index 9b82bb8182..e9c506253b 100644 --- a/src/nvim/normal.h +++ b/src/nvim/normal.h @@ -4,7 +4,7 @@ #include "nvim/buffer_defs.h" #include "nvim/macros.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" // Values for find_ident_under_cursor() #define FIND_IDENT 1 // find identifier (word) diff --git a/src/nvim/ops.h b/src/nvim/ops.h index 7c8e7b4640..391c8d865a 100644 --- a/src/nvim/ops.h +++ b/src/nvim/ops.h @@ -12,7 +12,7 @@ #include "nvim/normal.h" #include "nvim/option_defs.h" #include "nvim/os/time.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" typedef int (*Indenter)(void); diff --git a/src/nvim/option.c b/src/nvim/option.c index 23569c4584..ba38f0f643 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -81,7 +81,7 @@ #include "nvim/os/os.h" #include "nvim/path.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/runtime.h" #include "nvim/search.h" diff --git a/src/nvim/optionstr.c b/src/nvim/optionstr.c index 97c4fd4393..04602e4283 100644 --- a/src/nvim/optionstr.c +++ b/src/nvim/optionstr.c @@ -37,7 +37,7 @@ #include "nvim/option_vars.h" #include "nvim/optionstr.h" #include "nvim/os/os.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/spell.h" #include "nvim/spellfile.h" diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c index 2d4f58e45e..ead5de32b5 100644 --- a/src/nvim/os/shell.c +++ b/src/nvim/os/shell.c @@ -36,7 +36,7 @@ #include "nvim/os/signal.h" #include "nvim/os/time.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/rbuffer.h" #include "nvim/strings.h" diff --git a/src/nvim/plines.c b/src/nvim/plines.c index bd1351b490..e900d64715 100644 --- a/src/nvim/plines.c +++ b/src/nvim/plines.c @@ -21,7 +21,7 @@ #include "nvim/option.h" #include "nvim/option_vars.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/state.h" #include "nvim/types.h" #include "nvim/vim.h" diff --git a/src/nvim/plines.h b/src/nvim/plines.h index c4832be94c..0d3dd9f059 100644 --- a/src/nvim/plines.h +++ b/src/nvim/plines.h @@ -5,7 +5,7 @@ #include "nvim/buffer_defs.h" #include "nvim/marktree.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" /// Argument for lbr_chartabsize(). typedef struct { diff --git a/src/nvim/popupmenu.c b/src/nvim/popupmenu.c index a6eb32ecb1..37c36ac1a2 100644 --- a/src/nvim/popupmenu.c +++ b/src/nvim/popupmenu.c @@ -30,7 +30,7 @@ #include "nvim/option.h" #include "nvim/option_vars.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/strings.h" #include "nvim/ui.h" #include "nvim/ui_compositor.h" diff --git a/src/nvim/pos.h b/src/nvim/pos_defs.h similarity index 100% rename from src/nvim/pos.h rename to src/nvim/pos_defs.h diff --git a/src/nvim/profile.c b/src/nvim/profile.c index d42f2aceeb..e65d6ae1d3 100644 --- a/src/nvim/profile.c +++ b/src/nvim/profile.c @@ -26,7 +26,7 @@ #include "nvim/os/fs.h" #include "nvim/os/os.h" #include "nvim/os/time.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/runtime.h" #include "nvim/types.h" diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index c35e35916d..6076721d67 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -52,7 +52,7 @@ #include "nvim/os/input.h" #include "nvim/os/os.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/quickfix.h" #include "nvim/regexp.h" #include "nvim/search.h" diff --git a/src/nvim/quickfix.h b/src/nvim/quickfix.h index ecbde31512..559ae7ff63 100644 --- a/src/nvim/quickfix.h +++ b/src/nvim/quickfix.h @@ -3,7 +3,7 @@ #include "nvim/eval/typval_defs.h" // IWYU pragma: keep #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep #include "nvim/option_defs.h" // IWYU pragma: keep -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" // flags for skip_vimgrep_pat() diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 1bab1bf2d5..55442817c1 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -35,7 +35,7 @@ #include "nvim/option_vars.h" #include "nvim/os/input.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/regexp.h" #include "nvim/regexp_defs.h" diff --git a/src/nvim/regexp.h b/src/nvim/regexp.h index 3a490aec55..426ac97493 100644 --- a/src/nvim/regexp.h +++ b/src/nvim/regexp.h @@ -1,7 +1,7 @@ #pragma once #include "nvim/buffer_defs.h" // IWYU pragma: keep -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp_defs.h" // IWYU pragma: export #include "nvim/types.h" diff --git a/src/nvim/regexp_defs.h b/src/nvim/regexp_defs.h index 28e861dbaf..ab349bfc86 100644 --- a/src/nvim/regexp_defs.h +++ b/src/nvim/regexp_defs.h @@ -11,7 +11,7 @@ #include -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" /// Used for "magic_overruled". diff --git a/src/nvim/runtime.h b/src/nvim/runtime.h index f4b8897c3e..187f8ae7e3 100644 --- a/src/nvim/runtime.h +++ b/src/nvim/runtime.h @@ -10,7 +10,7 @@ #include "nvim/ex_eval_defs.h" #include "nvim/garray_defs.h" #include "nvim/option_defs.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" typedef enum { diff --git a/src/nvim/search.h b/src/nvim/search.h index 8dd123432a..45432f41f5 100644 --- a/src/nvim/search.h +++ b/src/nvim/search.h @@ -7,7 +7,7 @@ #include "nvim/eval/typval_defs.h" #include "nvim/normal.h" #include "nvim/os/time.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" #include "nvim/vim.h" diff --git a/src/nvim/shada.c b/src/nvim/shada.c index fbb5d835a5..8078f950c7 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -46,7 +46,7 @@ #include "nvim/os/os.h" #include "nvim/os/time.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/search.h" #include "nvim/shada.h" diff --git a/src/nvim/sign.c b/src/nvim/sign.c index 7d0db18970..e7822b369d 100644 --- a/src/nvim/sign.c +++ b/src/nvim/sign.c @@ -38,7 +38,7 @@ #include "nvim/memory.h" #include "nvim/message.h" #include "nvim/move.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/sign.h" #include "nvim/sign_defs.h" #include "nvim/strings.h" diff --git a/src/nvim/spell.c b/src/nvim/spell.c index 7c2d58c82b..2839a1c7cb 100644 --- a/src/nvim/spell.c +++ b/src/nvim/spell.c @@ -93,7 +93,7 @@ #include "nvim/os/input.h" #include "nvim/os/os_defs.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/runtime.h" #include "nvim/search.h" diff --git a/src/nvim/spellfile.c b/src/nvim/spellfile.c index 0df00aceee..b30e595b2f 100644 --- a/src/nvim/spellfile.c +++ b/src/nvim/spellfile.c @@ -258,7 +258,7 @@ #include "nvim/os/os.h" #include "nvim/os/time.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/runtime.h" #include "nvim/spell.h" diff --git a/src/nvim/spellsuggest.c b/src/nvim/spellsuggest.c index 98feb6e5d3..589f828c46 100644 --- a/src/nvim/spellsuggest.c +++ b/src/nvim/spellsuggest.c @@ -37,7 +37,7 @@ #include "nvim/os/fs.h" #include "nvim/os/input.h" #include "nvim/os/os_defs.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/spell.h" #include "nvim/spellfile.h" diff --git a/src/nvim/statusline.c b/src/nvim/statusline.c index 774bd1d00c..6acc328be3 100644 --- a/src/nvim/statusline.c +++ b/src/nvim/statusline.c @@ -35,7 +35,7 @@ #include "nvim/os/os.h" #include "nvim/path.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/sign.h" #include "nvim/statusline.h" #include "nvim/strings.h" diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 7243cc9881..c13b2859ce 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -37,7 +37,7 @@ #include "nvim/optionstr.h" #include "nvim/os/input.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/regexp.h" #include "nvim/runtime.h" diff --git a/src/nvim/tag.c b/src/nvim/tag.c index 67453b40eb..b936ca618f 100644 --- a/src/nvim/tag.c +++ b/src/nvim/tag.c @@ -47,7 +47,7 @@ #include "nvim/os/os_defs.h" #include "nvim/os/time.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/quickfix.h" #include "nvim/regexp.h" #include "nvim/runtime.h" diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c index 025efce7c8..28f532d986 100644 --- a/src/nvim/terminal.c +++ b/src/nvim/terminal.c @@ -79,7 +79,7 @@ #include "nvim/option.h" #include "nvim/option_vars.h" #include "nvim/optionstr.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/state.h" #include "nvim/terminal.h" #include "nvim/types.h" diff --git a/src/nvim/textformat.c b/src/nvim/textformat.c index c28aea0216..d9ee406c75 100644 --- a/src/nvim/textformat.c +++ b/src/nvim/textformat.c @@ -31,7 +31,7 @@ #include "nvim/option.h" #include "nvim/option_vars.h" #include "nvim/os/input.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/search.h" #include "nvim/strings.h" #include "nvim/textformat.h" diff --git a/src/nvim/textformat.h b/src/nvim/textformat.h index 809e509db6..4beafeb7ec 100644 --- a/src/nvim/textformat.h +++ b/src/nvim/textformat.h @@ -1,7 +1,7 @@ #pragma once #include "nvim/normal.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "textformat.h.generated.h" diff --git a/src/nvim/textobject.c b/src/nvim/textobject.c index 11db5697f0..d5025fde6b 100644 --- a/src/nvim/textobject.c +++ b/src/nvim/textobject.c @@ -22,7 +22,7 @@ #include "nvim/move.h" #include "nvim/normal.h" #include "nvim/option_vars.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/search.h" #include "nvim/strings.h" #include "nvim/textobject.h" diff --git a/src/nvim/textobject.h b/src/nvim/textobject.h index cc8e22d6ef..9e78a98d4a 100644 --- a/src/nvim/textobject.h +++ b/src/nvim/textobject.h @@ -1,7 +1,7 @@ #pragma once #include "nvim/normal.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/vim.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/undo.c b/src/nvim/undo.c index 50e2b18c31..74f2d2139a 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -117,7 +117,7 @@ #include "nvim/os/os_defs.h" #include "nvim/os/time.h" #include "nvim/path.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/sha256.h" #include "nvim/spell.h" #include "nvim/state.h" diff --git a/src/nvim/undo.h b/src/nvim/undo.h index 8282bd8d6e..19de86a158 100644 --- a/src/nvim/undo.h +++ b/src/nvim/undo.h @@ -2,7 +2,7 @@ #include "nvim/buffer_defs.h" // IWYU pragma: keep #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" #include "nvim/undo_defs.h" // IWYU pragma: export diff --git a/src/nvim/undo_defs.h b/src/nvim/undo_defs.h index de925c3937..3e745ab4dc 100644 --- a/src/nvim/undo_defs.h +++ b/src/nvim/undo_defs.h @@ -4,7 +4,7 @@ #include "nvim/extmark_defs.h" #include "nvim/mark_defs.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" typedef struct u_header u_header_T; diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 4c6129f0db..2208259de4 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -1,6 +1,6 @@ #pragma once -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" // Some defines from the old feature.h diff --git a/src/nvim/window.c b/src/nvim/window.c index fe30ccacf9..cb2f3a79f4 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -60,7 +60,7 @@ #include "nvim/os/os_defs.h" #include "nvim/path.h" #include "nvim/plines.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/quickfix.h" #include "nvim/search.h" #include "nvim/state.h" diff --git a/src/nvim/winfloat.c b/src/nvim/winfloat.c index 25c6e2a15f..d4082b5a8d 100644 --- a/src/nvim/winfloat.c +++ b/src/nvim/winfloat.c @@ -18,7 +18,7 @@ #include "nvim/move.h" #include "nvim/option.h" #include "nvim/optionstr.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/strings.h" #include "nvim/ui.h" #include "nvim/vim.h"