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.

diff --git a/src/terminal.c b/src/terminal.c
index 69b3306a412a15d7a803c0e1615ca44082816be7..a65fc00701e8ce9186d470462db6f23da3c2690a 100644 (file)
--- 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 9f1075e8ff17fc83a1802317eb44142b85bc6054..2890f7135bd783939c1261c241d6b6eef289d817 100644 (file)
--- 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,
 /**/