From 07b46af645fa7a2b95afec3f3d87c91942d9cbd0 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 10 Apr 2018 14:56:18 +0200 Subject: [PATCH] patch 8.0.1684: ml_get errors when using terminal window for shell command Problem: ml_get errors when using terminal window for shell command. (Blay263) Solution: Do not change the size of the current window. --- src/terminal.c | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/terminal.c b/src/terminal.c index 69b3306a41..a65fc00701 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 9f1075e8ff..2890f7135b 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1684, /**/ 1683, /**/