Commit: patch 9.1.1462: missing change from patch v9.1.1461

2 views
Skip to first unread message

Christian Brabandt

unread,
Jun 16, 2025, 2:15:13 PMJun 16
to vim...@googlegroups.com
patch 9.1.1462: missing change from patch v9.1.1461

Commit: https://github.com/vim/vim/commit/8ae8b304eea0301282b87f5bea1e4320080727f1
Author: Christian Brabandt <c...@256bit.org>
Date: Mon Jun 16 20:07:54 2025 +0200

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 <c...@256bit.org>

diff --git a/src/term.c b/src/term.c
index c7ac8ab77..720c8a0c6 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 6a65d18d0..c9d63e970 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 29bcc432b..e05d46926 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)
{
Reply all
Reply to author
Forward
0 new messages