diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-04-10 14:56:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-04-10 14:56:18 +0200 |
| commit | 07b46af645fa7a2b95afec3f3d87c91942d9cbd0 (patch) | |
| tree | 044fb6e5687f98689756f41e910987e1b0d12d06 | |
| parent | 0424958bde3d3e74c721ba39ab4d5a4744897393 (diff) | |
| download | vim-git-07b46af645fa7a2b95afec3f3d87c91942d9cbd0.tar.gz | |
patch 8.0.1684: ml_get errors when using terminal window for shell commandv8.0.1684
Problem: ml_get errors when using terminal window for shell command.
(Blay263)
Solution: Do not change the size of the current window.
| -rw-r--r-- | src/terminal.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/terminal.c b/src/terminal.c index 69b3306a4..a65fc0070 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -225,8 +225,8 @@ set_term_and_win_size(term_T *term) * at the command line and scroll up as needed, using tl_toprow. */ term->tl_rows = Rows; term->tl_cols = Columns; + return; } - else #endif if (*curwin->w_p_tms != NUL) { diff --git a/src/version.c b/src/version.c index 9f1075e8f..2890f7135 100644 --- a/src/version.c +++ b/src/version.c @@ -763,6 +763,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1684, +/**/ 1683, /**/ 1682, |