From a8071354e18261d6ad761b1f804bfe65094f69f5 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Tue, 3 Jul 2018 20:58:22 -0400 Subject: [PATCH 1/2] vim-patch:8.0.0640: mismatch between help and actual message Problem: Mismatch between help and actual message for ":syn conceal". Solution: Change the message to match the help. (Ken Takata) https://github.com/vim/vim/commit/83064068eaabf75a7d235b0eec561dccbcb96b31 --- src/nvim/syntax.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 53bfd161ca..98e457db18 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -3034,9 +3034,9 @@ static void syn_cmd_conceal(exarg_T *eap, int syncing) next = skiptowhite(arg); if (*arg == NUL) { if (curwin->w_s->b_syn_conceal) { - MSG(_("syn conceal on")); + MSG(_("syntax conceal on")); } else { - MSG(_("syn conceal off")); + MSG(_("syntax conceal off")); } } else if (STRNICMP(arg, "on", 2) == 0 && next - arg == 2) { curwin->w_s->b_syn_conceal = true; From 297dc3f9976719014d717f65ca794995ce0f4a5b Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Tue, 3 Jul 2018 21:12:36 -0400 Subject: [PATCH 2/2] vim-patch:8.0.0686: extra redraw when using CTRL-L in second window Problem: When typing CTRL-L in a window that's not the first one, another redraw will happen later. (Christian Brabandt) Solution: Reset must_redraw after calling screenclear(). https://github.com/vim/vim/commit/9f5f7bf4d5f757ef885acf74ce03c25429a328aa --- src/nvim/screen.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 4c011e466b..ce5c994526 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -337,6 +337,8 @@ void update_screen(int type) screenclear(); // will reset clear_cmdline cmdline_screen_cleared(); // clear external cmdline state type = NOT_VALID; + // must_redraw may be set indirectly, avoid another redraw later + must_redraw = 0; } if (clear_cmdline) /* going to clear cmdline (done below) */