diff options
author | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:40:31 +0000 |
---|---|---|
committer | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:40:31 +0000 |
commit | 339e2d15cc26fe86988ea06468d912a46c8d6f29 (patch) | |
tree | a6167fc8fcfc6ae2dc102f57b2473858eac34063 /src/nvim/popupmenu.h | |
parent | 067dc73729267c0262438a6fdd66e586f8496946 (diff) | |
parent | 4a8bf24ac690004aedf5540fa440e788459e5e34 (diff) | |
download | rneovim-339e2d15cc26fe86988ea06468d912a46c8d6f29.tar.gz rneovim-339e2d15cc26fe86988ea06468d912a46c8d6f29.tar.bz2 rneovim-339e2d15cc26fe86988ea06468d912a46c8d6f29.zip |
Merge remote-tracking branch 'upstream/master' into fix_repeatcmdline
Diffstat (limited to 'src/nvim/popupmenu.h')
-rw-r--r-- | src/nvim/popupmenu.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/nvim/popupmenu.h b/src/nvim/popupmenu.h index 08b791c509..24a3f8713a 100644 --- a/src/nvim/popupmenu.h +++ b/src/nvim/popupmenu.h @@ -1,12 +1,11 @@ -#ifndef NVIM_POPUPMENU_H -#define NVIM_POPUPMENU_H +#pragma once #include <stdbool.h> +#include "nvim/eval/typval_defs.h" // IWYU pragma: keep #include "nvim/grid_defs.h" -#include "nvim/macros.h" -#include "nvim/types.h" -#include "nvim/vim.h" +#include "nvim/macros_defs.h" +#include "nvim/menu_defs.h" // IWYU pragma: keep /// Used for popup menu items. typedef struct { @@ -16,7 +15,7 @@ typedef struct { char *pum_info; // extra info } pumitem_T; -EXTERN ScreenGrid pum_grid INIT(= SCREEN_GRID_INIT); +EXTERN ScreenGrid pum_grid INIT( = SCREEN_GRID_INIT); /// state for pum_ext_select_item. EXTERN struct { @@ -29,4 +28,3 @@ EXTERN struct { #ifdef INCLUDE_GENERATED_DECLARATIONS # include "popupmenu.h.generated.h" #endif -#endif // NVIM_POPUPMENU_H |