mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-06 01:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(startup): trigger UIEnter for the correct channel (#25860)

Browse Source
This commit is contained in:
zeertzjq
2023-11-01 12:16:37 +08:00
committed by GitHub
parent 4e6096a67f
commit d7359a8742
5 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/autocmd.c
View File

@@ -2570,6 +2570,9 @@ void do_autocmd_uienter(uint64_t chanid, bool attached)
{
static bool recursive = false;
if (starting == NO_SCREEN) {
return; // user config hasn't been sourced yet
}
if (recursive) {
return; // disallow recursion
}

2
src/nvim/main.c
View File

@@ -589,7 +589,7 @@ int main(int argc, char **argv)
apply_autocmds(EVENT_VIMENTER, NULL, NULL, false, curbuf);
TIME_MSG("VimEnter autocommands");
if (use_remote_ui) {
do_autocmd_uienter(CHAN_STDIO, true);
do_autocmd_uienter_all();
TIME_MSG("UIEnter autocommands");
}

10
src/nvim/ui.c
View File

@@ -337,6 +337,16 @@ void vim_beep(unsigned val)
}
}
/// Trigger UIEnter for all attached UIs.
/// Used on startup after VimEnter.
void do_autocmd_uienter_all(void)
{
for (size_t i = 0; i < ui_count; i++) {
UIData *data = uis[i]->data;
do_autocmd_uienter(data->channel_id, true);
}
}
void ui_attach_impl(UI *ui, uint64_t chanid)
{
if (ui_count == MAX_UI_COUNT) {