summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-08-02 12:15:51 +0100
committerBram Moolenaar <Bram@vim.org>2022-08-02 12:15:51 +0100
commit0b0ccbbfb014e1c9682b86a7a41ff2837b0b8047 (patch)
treef7e39ab750c5abaa31fc5656227f71cd76164ff8
parentf05a1e59a3df759667f2082cf42368945c57e389 (diff)
downloadvim-git-0b0ccbbfb014e1c9682b86a7a41ff2837b0b8047.tar.gz
patch 9.0.0135: comment about tabpage line above the wrong codev9.0.0135
Problem: Comment about tabpage line above the wrong code. Solution: Move the comment. (closes #10836)
-rw-r--r--src/version.c2
-rw-r--r--src/window.c9
2 files changed, 7 insertions, 4 deletions
diff --git a/src/version.c b/src/version.c
index 6113e333f..33f61aadf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 135,
+/**/
134,
/**/
133,
diff --git a/src/window.c b/src/window.c
index 58a9ff9c6..f0d66da2f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4324,10 +4324,8 @@ enter_tabpage(
diff_need_scrollbind = TRUE;
#endif
- // The tabpage line may have appeared or disappeared, may need to resize
- // the frames for that. When the Vim window was resized need to update
- // frame sizes too. Use the stored value of p_ch, so that it can be
- // different for each tab page.
+ // Use the stored value of p_ch, so that it can be different for each tab
+ // page.
if (p_ch != curtab->tp_ch_used)
clear_cmdline = TRUE;
p_ch = curtab->tp_ch_used;
@@ -4338,6 +4336,9 @@ enter_tabpage(
if ((row < cmdline_row) && (cmdline_row <= Rows - p_ch))
clear_cmdline = TRUE;
+ // The tabpage line may have appeared or disappeared, may need to resize
+ // the frames for that. When the Vim window was resized need to update
+ // frame sizes too.
if (curtab->tp_old_Rows != Rows || (old_off != firstwin->w_winrow
#ifdef FEAT_GUI_TABLINE
&& !gui_use_tabline()