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

diff --git a/src/term.c b/src/term.c
index c7ac8ab778523681371632aa4d227a620bf8156c..720c8a0c6b5de503ca4fa69995b84903e22e8fe8 100644 (file)
--- 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 6a65d18d098048aed434a1ed3ff89b7c5aab0948..c9d63e970568c0177a096f03c0a291bc60454936 100644 (file)
--- 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 29bcc432bd800a0c8e628f14ee6963f8b92a5107..e05d46926b8af0772e33f6c0a9862d5cec3fa33f 100644 (file)
--- 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)
        {