diff options
| author | bfredl <bjorn.linse@gmail.com> | 2024-03-15 10:02:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-15 10:02:26 +0100 |
| commit | f1c9228bba936986233627ee514ade6f319c2716 (patch) | |
| tree | fc6eb360a8331ddf85ebc14f34f8b64c206c7c07 /src | |
| parent | 8350839a8796bc37e5849d78eb919e3d100f332e (diff) | |
| parent | d41b8d47587bd4c300420fa76f517298e97af513 (diff) | |
| download | rneovim-f1c9228bba936986233627ee514ade6f319c2716.tar.gz rneovim-f1c9228bba936986233627ee514ade6f319c2716.tar.bz2 rneovim-f1c9228bba936986233627ee514ade6f319c2716.zip | |
Merge pull request #27858 from luukvbaal/nvim_set_cursor
fix(ui): issues controlling cursor position with ext_cmdline
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/api/window.c | 2 | ||||
| -rw-r--r-- | src/nvim/ex_getln.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index 026d09d9a9..30f77c7248 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -148,7 +148,7 @@ void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err) switchwin_T switchwin; switch_win(&switchwin, win, NULL, true); update_topline(curwin); - validate_cursor(curwin); + setcursor_mayforce(true); restore_win(&switchwin, true); redraw_later(win, UPD_VALID); diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 303337ae98..d482f9851e 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -767,7 +767,7 @@ static uint8_t *command_line_enter(int firstc, int count, int indent, bool clear } setmouse(); - ui_cursor_shape(); // may show different cursor shape + setcursor(); TryState tstate; Error err = ERROR_INIT; @@ -927,7 +927,6 @@ static uint8_t *command_line_enter(int firstc, int count, int indent, bool clear } may_trigger_modechanged(); setmouse(); - ui_cursor_shape(); // may show different cursor shape sb_text_end_cmdline(); theend: @@ -3859,7 +3858,6 @@ void cursorcmd(void) if (ccline.redraw_state < kCmdRedrawPos) { ccline.redraw_state = kCmdRedrawPos; } - setcursor(); return; } @@ -4553,6 +4551,7 @@ static int open_cmdwin(void) State = save_State; may_trigger_modechanged(); setmouse(); + setcursor(); return cmdwin_result; } |