IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8680 from janlazo/vim-8.0.0640

Browse Source
This commit is contained in:
Justin M. Keyes 2018-07-04 19:23:56 +02:00 committed by GitHub
commit 2bfabd5bf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/screen.c
View File

@ -337,6 +337,8 @@ void update_screen(int type)
screenclear(); // will reset clear_cmdline screenclear(); // will reset clear_cmdline
cmdline_screen_cleared(); // clear external cmdline state cmdline_screen_cleared(); // clear external cmdline state
type = NOT_VALID; 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) */ if (clear_cmdline) /* going to clear cmdline (done below) */

4
src/nvim/syntax.c
View File

@ -3034,9 +3034,9 @@ static void syn_cmd_conceal(exarg_T *eap, int syncing)
next = skiptowhite(arg); next = skiptowhite(arg);
if (*arg == NUL) { if (*arg == NUL) {
if (curwin->w_s->b_syn_conceal) { if (curwin->w_s->b_syn_conceal) {
MSG(_("syn conceal on")); MSG(_("syntax conceal on"));
} else { } else {
MSG(_("syn conceal off")); MSG(_("syntax conceal off"));
} }
} else if (STRNICMP(arg, "on", 2) == 0 && next - arg == 2) { } else if (STRNICMP(arg, "on", 2) == 0 && next - arg == 2) {
curwin->w_s->b_syn_conceal = true; curwin->w_s->b_syn_conceal = true;