mirror of
https://github.com/neovim/neovim.git
synced 2025-10-13 13:26:06 +00:00
vim-patch:9.1.1351: Return value of getcmdline() inconsistent in CmdlineLeavePre
Problem: Return value of getcmdline() inconsistent in CmdlineLeavePre
when leaving cmdline in different ways (after v9.1.1329).
Solution: Trigger CmdlineLeavePre before calling abandon_cmdline() so
that getcmdline() can return the command line (zeertzjq).
closes: vim/vim#17218
9240369774
This commit is contained in:
@@ -871,6 +871,11 @@ static uint8_t *command_line_enter(int firstc, int count, int indent, bool clear
|
||||
|
||||
state_enter(&s->state);
|
||||
|
||||
// Trigger CmdlineLeavePre autocommands if not already triggered.
|
||||
if (!s->event_cmdlineleavepre_triggered) {
|
||||
trigger_cmd_autocmd(s->cmdline_type, EVENT_CMDLINELEAVEPRE);
|
||||
}
|
||||
|
||||
if (has_event(EVENT_CMDLINELEAVE)) {
|
||||
save_v_event_T save_v_event;
|
||||
dict_T *dict = get_v_event(&save_v_event);
|
||||
@@ -950,11 +955,6 @@ static uint8_t *command_line_enter(int firstc, int count, int indent, bool clear
|
||||
need_wait_return = false;
|
||||
}
|
||||
|
||||
// Trigger CmdlineLeavePre autocommands if not already triggered.
|
||||
if (!s->event_cmdlineleavepre_triggered) {
|
||||
trigger_cmd_autocmd(s->cmdline_type, EVENT_CMDLINELEAVEPRE);
|
||||
}
|
||||
|
||||
set_option_direct(kOptInccommand, CSTR_AS_OPTVAL(s->save_p_icm), 0, SID_NONE);
|
||||
State = s->save_State;
|
||||
if (cmdpreview != save_cmdpreview) {
|
||||
|
Reference in New Issue
Block a user