diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-07-04 19:23:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 19:23:56 +0200 |
| commit | 2bfabd5bf8af45c6fbfcf3e265dbc4bdc275deac (patch) | |
| tree | d78e2a69e5101f5389957286766abe350102e98e | |
| parent | e889640048ddeb37f428ebeaa39bccca4f7508e0 (diff) | |
| parent | 297dc3f9976719014d717f65ca794995ce0f4a5b (diff) | |
| download | rneovim-2bfabd5bf8af45c6fbfcf3e265dbc4bdc275deac.tar.gz rneovim-2bfabd5bf8af45c6fbfcf3e265dbc4bdc275deac.tar.bz2 rneovim-2bfabd5bf8af45c6fbfcf3e265dbc4bdc275deac.zip | |
Merge #8680 from janlazo/vim-8.0.0640
| -rw-r--r-- | src/nvim/screen.c | 2 | ||||
| -rw-r--r-- | src/nvim/syntax.c | 4 |
2 files changed, 4 insertions, 2 deletions
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) */ 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; |