diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2019-01-11 12:30:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 12:30:17 +0100 |
| commit | 8853fca1fdc5ee3a2aea3eb3e772e091946a3a71 (patch) | |
| tree | 795d73cfbc14ffdd3615e48bd19baeb0a830ec3f /src/nvim/edit.c | |
| parent | 10f29f79f4e8240254b916160ae5bb17ff56d161 (diff) | |
| parent | 889f73e8618458ed46050e26cac0dee30a19b4f4 (diff) | |
| download | rneovim-8853fca1fdc5ee3a2aea3eb3e772e091946a3a71.tar.gz rneovim-8853fca1fdc5ee3a2aea3eb3e772e091946a3a71.tar.bz2 rneovim-8853fca1fdc5ee3a2aea3eb3e772e091946a3a71.zip | |
Merge pull request #9484 from bfredl/highlander
screen: make update_screen() the only entry point for redrawing
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 50c28dbaad..5e559462bc 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -1452,21 +1452,24 @@ ins_redraw ( } } - if (must_redraw) - update_screen(0); - else if (clear_cmdline || redraw_cmdline) - showmode(); /* clear cmdline and show mode */ if ((conceal_update_lines && (conceal_old_cursor_line != conceal_new_cursor_line || conceal_cursor_line(curwin))) || need_cursor_line_redraw) { - if (conceal_old_cursor_line != conceal_new_cursor_line) - update_single_line(curwin, conceal_old_cursor_line); - update_single_line(curwin, conceal_new_cursor_line == 0 - ? curwin->w_cursor.lnum : conceal_new_cursor_line); + if (conceal_old_cursor_line != conceal_new_cursor_line) { + redrawWinline(curwin, conceal_old_cursor_line); + } + redrawWinline(curwin, conceal_new_cursor_line == 0 + ? curwin->w_cursor.lnum : conceal_new_cursor_line); curwin->w_valid &= ~VALID_CROW; } - showruler(FALSE); + + if (must_redraw) { + update_screen(0); + } else if (clear_cmdline || redraw_cmdline) { + showmode(); // clear cmdline and show mode + } + showruler(false); setcursor(); emsg_on_display = FALSE; /* may remove error message now */ } |