diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-12-01 16:37:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-01 16:37:09 +0800 |
| commit | 76a30f2bd0f4e5abe906eabcdce092931d712be3 (patch) | |
| tree | 492274a977f8d2e79ffc136b9c050b4570988cae | |
| parent | 548f03c66c08d0235d62505e884e8088bfda1804 (diff) | |
| download | rneovim-76a30f2bd0f4e5abe906eabcdce092931d712be3.tar.gz rneovim-76a30f2bd0f4e5abe906eabcdce092931d712be3.tar.bz2 rneovim-76a30f2bd0f4e5abe906eabcdce092931d712be3.zip | |
refactor: move float_relative_str[] to nvim_win_get_config() (#26344)
It's only used in one place, as it's usually conveyed as non-string.
| -rw-r--r-- | src/nvim/api/win_config.c | 3 | ||||
| -rw-r--r-- | src/nvim/buffer_defs.h | 2 | ||||
| -rw-r--r-- | src/nvim/winfloat.h | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/nvim/api/win_config.c b/src/nvim/api/win_config.c index 825a0583ef..856fac5585 100644 --- a/src/nvim/api/win_config.c +++ b/src/nvim/api/win_config.c @@ -311,6 +311,9 @@ static Dictionary config_put_bordertext(Dictionary config, FloatConfig *fconfig, Dictionary nvim_win_get_config(Window window, Error *err) FUNC_API_SINCE(6) { + /// Keep in sync with FloatRelative in buffer_defs.h + static const char *const float_relative_str[] = { "editor", "win", "cursor", "mouse" }; + Dictionary rv = ARRAY_DICT_INIT; win_T *wp = find_window_by_handle(window, err); diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h index 8928eea028..b26d42385b 100644 --- a/src/nvim/buffer_defs.h +++ b/src/nvim/buffer_defs.h @@ -902,7 +902,7 @@ enum { kFloatAnchorSouth = 2, }; -/// Keep in sync with float_relative_str in winfloat.h +/// Keep in sync with float_relative_str[] in nvim_win_get_config() typedef enum { kFloatRelativeEditor = 0, kFloatRelativeWindow = 1, diff --git a/src/nvim/winfloat.h b/src/nvim/winfloat.h index 877a12a9e7..6e30c8da69 100644 --- a/src/nvim/winfloat.h +++ b/src/nvim/winfloat.h @@ -10,10 +10,6 @@ /// SE -> kFloatAnchorSouth | kFloatAnchorEast EXTERN const char *const float_anchor_str[] INIT( = { "NW", "NE", "SW", "SE" }); -/// Keep in sync with FloatRelative in buffer_defs.h -EXTERN const char *const float_relative_str[] -INIT( = { "editor", "win", "cursor", "mouse" }); - #ifdef INCLUDE_GENERATED_DECLARATIONS # include "winfloat.h.generated.h" #endif |