mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 14:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0511: CursorMovedC triggered wrongly with setcmdpos()

Browse Source 
Problem:  CursorMovedC triggered wrongly with setcmdpos()
          (after v9.1.0507)
Solution: Remove the premature triggering.  Also don't trigger when
          cursor didn't move. (zeertzjq)

closes: vim/vim#15064

bc6f96708e
This commit is contained in:
zeertzjq
2024-06-21 14:11:05 +08:00
parent 86ea42ce26
commit f45403db19
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/ex_getln.c
View File

@@ -134,7 +134,7 @@ typedef struct {
int wim_index; // index in wim_flags[]
int save_msg_scroll;
int save_State; // remember State when called
int save_cmdspos;
int prev_cmdpos;
char *save_p_icm;
int some_key_typed; // one of the keys was typed
// mouse drag and release events are ignored, unless they are
@@ -691,7 +691,7 @@ static uint8_t *command_line_enter(int firstc, int count, int indent, bool clear
.indent = indent,
.save_msg_scroll = msg_scroll,
.save_State = State,
.save_cmdspos = ccline.cmdspos,
.prev_cmdpos = -1,
.ignore_drag_release = true,
};
CommandLineState *s = &state;
@@ -2184,10 +2184,10 @@ static int command_line_handle_key(CommandLineState *s)
static int command_line_not_changed(CommandLineState *s)
{
// Trigger CursorMovedC autocommands.
if (ccline.cmdspos != s->save_cmdspos) {
if (ccline.cmdpos != s->prev_cmdpos) {
trigger_cmd_autocmd(get_cmdline_type(), EVENT_CURSORMOVEDC);
s->prev_cmdpos = ccline.cmdpos;
}
// Incremental searches for "/" and "?":
// Enter command_line_not_changed() when a character has been read but the
// command line did not change. Then we only search and redraw if something
@@ -2662,6 +2662,7 @@ static void do_autocmd_cmdlinechanged(int firstc)
static int command_line_changed(CommandLineState *s)
{
s->prev_cmdpos = ccline.cmdpos;
// Trigger CmdlineChanged autocommands.
do_autocmd_cmdlinechanged(s->firstc > 0 ? s->firstc : '-');
@@ -4191,9 +4192,6 @@ static int set_cmdline_pos(int pos)
new_cmdpos = pos;
}
// Trigger CursorMovedC autocommands.
trigger_cmd_autocmd(get_cmdline_type(), EVENT_CURSORMOVEDC);
return 0;
}