From 539e9b571ae2a80dfa8a42eb132ad9f65f0bbcbc Mon Sep 17 00:00:00 2001 From: Ken Takata Date: Thu, 5 Sep 2024 17:19:34 +0200 Subject: [PATCH] patch 9.1.0716: resetting setcellwidth() doesn't update the screen Problem: resetting setcellwidth() doesn't update the screen Solution: Redraw after clearing the cellwidth table (Ken Takata) closes: #15628 Signed-off-by: Ken Takata Signed-off-by: Christian Brabandt --- src/mbyte.c | 3 ++- src/testdir/test_utf8.vim | 3 +++ src/version.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mbyte.c b/src/mbyte.c index d8c47acdd1..fa67032a6f 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -5644,7 +5644,7 @@ f_setcellwidths(typval_T *argvars, typval_T *rettv UNUSED) // Clearing the table. VIM_CLEAR(cw_table); cw_table_size = 0; - return; + goto done; } ptrs = ALLOC_MULT(listitem_T *, l->lv_len); @@ -5756,6 +5756,7 @@ f_setcellwidths(typval_T *argvars, typval_T *rettv UNUSED) } vim_free(cw_table_save); +done: changed_window_setting_all(); redraw_all_later(UPD_CLEAR); } diff --git a/src/testdir/test_utf8.vim b/src/testdir/test_utf8.vim index 0f46240db5..0314fcdfd2 100644 --- a/src/testdir/test_utf8.vim +++ b/src/testdir/test_utf8.vim @@ -228,6 +228,9 @@ func Test_setcellwidths() call setcellwidths([[0x2103, 0x2103, 2]]) redraw call assert_equal(19, wincol()) + call setcellwidths([]) + redraw + call assert_equal((aw == 'single') ? 10 : 19, wincol()) endfor set ambiwidth& isprint& diff --git a/src/version.c b/src/version.c index 536c1fb03d..80da0e30a1 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 716, /**/ 715, /**/