patch 8.0.0789: splitting terminal window has resizing problems
Problem: When splitting a terminal window where the terminal follows the
size of the window doesn't work.
Solution: Use the size of the smallest window. (Yasuhiro Matsumoto, closes
#1885)
diff --git a/src/terminal.c b/src/terminal.c
index f197718..d12df36 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -927,8 +927,22 @@
if ((!term->tl_rows_fixed && term->tl_rows != wp->w_height)
|| (!term->tl_cols_fixed && term->tl_cols != wp->w_width))
{
- int rows = term->tl_rows_fixed ? term->tl_rows : wp->w_height;
- int cols = term->tl_cols_fixed ? term->tl_cols : wp->w_width;
+ int rows = term->tl_rows_fixed ? term->tl_rows : wp->w_height;
+ int cols = term->tl_cols_fixed ? term->tl_cols : wp->w_width;
+ win_T *twp;
+
+ FOR_ALL_WINDOWS(twp)
+ {
+ /* When more than one window shows the same terminal, use the
+ * smallest size. */
+ if (twp->w_buffer == term->tl_buffer)
+ {
+ if (!term->tl_rows_fixed && rows > twp->w_height)
+ rows = twp->w_height;
+ if (!term->tl_cols_fixed && cols > twp->w_width)
+ cols = twp->w_width;
+ }
+ }
vterm_set_size(vterm, rows, cols);
ch_logn(term->tl_job->jv_channel, "Resizing terminal to %d lines",
diff --git a/src/version.c b/src/version.c
index 7d06669..83e8735 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 789,
+/**/
788,
/**/
787,