From: Christian Brabandt Date: Mon, 16 Jun 2025 18:07:54 +0000 (+0200) Subject: patch 9.1.1462: missing change from patch v9.1.1461 X-Git-Tag: v9.1.1462^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ae8b304eea0301282b87f5bea1e4320080727f1;p=thirdparty%2Fvim.git patch 9.1.1462: missing change from patch v9.1.1461 Problem: missing change from patch v9.1.1461 Solution: change wrong TPL_LCOL macro in a few more places Signed-off-by: Christian Brabandt --- diff --git a/src/term.c b/src/term.c index c7ac8ab778..720c8a0c6b 100644 --- a/src/term.c +++ b/src/term.c @@ -3617,7 +3617,7 @@ win_new_shellsize(void) static int old_coloff = 0; if (old_Rows != Rows || old_Columns != COLUMNS_WITHOUT_TPL() - || old_coloff != TPL_LCOL(NULL)) + || old_coloff != TPL_LCOL()) ui_new_shellsize(); if (old_Rows != Rows) { @@ -3629,10 +3629,10 @@ win_new_shellsize(void) old_Rows = Rows; shell_new_rows(); // update window sizes } - if (old_Columns != COLUMNS_WITHOUT_TPL() || old_coloff != TPL_LCOL(NULL)) + if (old_Columns != COLUMNS_WITHOUT_TPL() || old_coloff != TPL_LCOL()) { old_Columns = COLUMNS_WITHOUT_TPL(); - old_coloff = TPL_LCOL(NULL); + old_coloff = TPL_LCOL(); shell_new_columns(); } diff --git a/src/version.c b/src/version.c index 6a65d18d09..c9d63e9705 100644 --- a/src/version.c +++ b/src/version.c @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1462, /**/ 1461, /**/ diff --git a/src/window.c b/src/window.c index 29bcc432bd..e05d46926b 100644 --- a/src/window.c +++ b/src/window.c @@ -5040,7 +5040,7 @@ enter_tabpage( )) shell_new_rows(); if (curtab->tp_old_Columns != COLUMNS_WITHOUT_TPL() - || curtab->tp_old_coloff != TPL_LCOL(NULL)) + || curtab->tp_old_coloff != TPL_LCOL()) { if (starting == 0) {