From c52dfb6e840827a2de713e40ea8506491ec7ce0b Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 17 Mar 2024 09:44:10 +0800 Subject: fix(normal): don't check conceal when pressing 'r' (#27892) Problem: Cursor line is unconcealed when pressing 'r' in Normal mode when 'concealcursor' contains 'n' but not 'i'. Solution: Don't check conceal when pressing 'r' in Normal mode. Vim doesn't have this problem because it doesn't call redrawWinline() in conceal_check_cursor_line() and instead sets a global variable. --- src/nvim/normal.c | 2 +- src/nvim/ui.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 3603a054b6..12f0bb631e 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -748,7 +748,7 @@ static void normal_get_additional_char(NormalState *s) bool langmap_active = false; // using :lmap mappings if (repl) { State = MODE_REPLACE; // pretend Replace mode - ui_cursor_shape(); // show different cursor shape + ui_cursor_shape_no_check_conceal(); // show different cursor shape } if (lang && curbuf->b_p_iminsert == B_IMODE_LMAP) { // Allow mappings defined with ":lmap". diff --git a/src/nvim/ui.c b/src/nvim/ui.c index bddcf98b53..506bb93f5b 100644 --- a/src/nvim/ui.c +++ b/src/nvim/ui.c @@ -624,7 +624,7 @@ void ui_check_mouse(void) /// Check if current mode has changed. /// /// May update the shape of the cursor. -void ui_cursor_shape(void) +void ui_cursor_shape_no_check_conceal(void) { if (!full_screen) { return; @@ -635,6 +635,15 @@ void ui_cursor_shape(void) ui_mode_idx = new_mode_idx; pending_mode_update = true; } +} + +/// Check if current mode has changed. +/// +/// May update the shape of the cursor. +/// With concealing on, may conceal or unconceal the cursor line. +void ui_cursor_shape(void) +{ + ui_cursor_shape_no_check_conceal(); conceal_check_cursor_line(); } -- cgit