diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-13 22:11:35 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-13 22:11:35 +0200 |
| commit | 072412ed45aa20a67aaa7e387d7f6bf59c7d3fbe (patch) | |
| tree | bd8e926a2c59305a1065d5991c9f95c3d601fcb6 | |
| parent | 518d6996998b35ccbc408b1b323f8869c0c1b4d8 (diff) | |
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is setv8.0.1100
Problem: Stuck in redraw loop when 'lazyredraw' is set.
Solution: Don't loop on update_screen() when not redrawing. (Yasuhiro
Matsumoto, closes #2082)
| -rw-r--r-- | src/proto/screen.pro | 2 | ||||
| -rw-r--r-- | src/screen.c | 8 | ||||
| -rw-r--r-- | src/terminal.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/src/proto/screen.pro b/src/proto/screen.pro index b40e0dadca..39424b485b 100644 --- a/src/proto/screen.pro +++ b/src/proto/screen.pro @@ -10,7 +10,7 @@ int redraw_asap(int type); void redraw_after_callback(int call_update_screen); void redrawWinline(linenr_T lnum, int invalid); void update_curbuf(int type); -void update_screen(int type_arg); +int update_screen(int type_arg); int conceal_cursor_line(win_T *wp); void conceal_check_cursur_line(void); void update_single_line(win_T *wp, linenr_T lnum); diff --git a/src/screen.c b/src/screen.c index 42995c727b..6ce478ecce 100644 --- a/src/screen.c +++ b/src/screen.c @@ -538,8 +538,9 @@ update_curbuf(int type) /* * Based on the current value of curwin->w_topline, transfer a screenfull * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. + * Return OK when the screen was updated, FAIL if it was not done. */ - void + int update_screen(int type_arg) { int type = type_arg; @@ -557,7 +558,7 @@ update_screen(int type_arg) /* Don't do anything if the screen structures are (not yet) valid. */ if (!screen_valid(TRUE)) - return; + return FAIL; if (type == VALID_NO_UPDATE) { @@ -589,7 +590,7 @@ update_screen(int type_arg) must_redraw = type; if (type > INVERTED_ALL) curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ - return; + return FAIL; } updating_screen = TRUE; @@ -842,6 +843,7 @@ update_screen(int type_arg) gui_update_scrollbars(FALSE); } #endif + return OK; } #if defined(FEAT_SIGNS) || defined(FEAT_GUI) || defined(FEAT_CONCEAL) diff --git a/src/terminal.c b/src/terminal.c index c025df1781..cb74fcb03e 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -40,7 +40,9 @@ * TODO: * - patch to use GUI or cterm colors for vterm. Yasuhiro, #2067 * - patch to add tmap, jakalope (Jacob Askeland) #2073 - * - Redirecting output does not work on MS-Windows. + * - Redirecting output does not work on MS-Windows, Test_terminal_redir_file() + * is disabled. + * - test_terminal_no_cmd hangs (Christian) * - implement term_setsize() * - add test for giving error for invalid 'termsize' value. * - support minimal size when 'termsize' is "rows*cols". @@ -1543,7 +1545,8 @@ terminal_loop(void) /* TODO: skip screen update when handling a sequence of keys. */ /* Repeat redrawing in case a message is received while redrawing. */ while (curwin->w_redr_type != 0) - update_screen(0); + if (update_screen(0) == FAIL) + break; update_cursor(curbuf->b_term, FALSE); c = term_vgetc(); diff --git a/src/version.c b/src/version.c index 689a10ee56..a62d1901c4 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1100, +/**/ 1099, /**/ 1098, |